diff options
| author | Richard Purdie <rpurdie@rpsys.net> | 2006-06-14 23:58:34 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-06-14 23:58:34 +0000 |
| commit | b22d41ba3ff712483da8bfcf6e5813903c2fb3de (patch) | |
| tree | a259143133c930d1189469e04ec90c1d19a675af /packages/opie-mediummount | |
| parent | a0621d7c282208125afd95093f6102baa4543dab (diff) | |
| parent | fc9beec2c099a3179d3407aeb18a6f84e1696e93 (diff) | |
merge of fb384f800bdb59aeed9d7bff06f6fa477bb6ddd6
and dbb4f8c5ce9d6875e4b652532e08c39932325b64
Diffstat (limited to 'packages/opie-mediummount')
3 files changed, 44 insertions, 3 deletions
diff --git a/packages/opie-mediummount/opie-mediummount-1.2.1/.mtn2git_empty b/packages/opie-mediummount/opie-mediummount-1.2.1/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/opie-mediummount/opie-mediummount-1.2.1/.mtn2git_empty diff --git a/packages/opie-mediummount/opie-mediummount-1.2.1/firststart-no-popup.patch b/packages/opie-mediummount/opie-mediummount-1.2.1/firststart-no-popup.patch new file mode 100644 index 0000000000..fd5542e392 --- /dev/null +++ b/packages/opie-mediummount/opie-mediummount-1.2.1/firststart-no-popup.patch @@ -0,0 +1,40 @@ +Index: mainwindow.cc +=================================================================== +RCS file: /cvs/opie/noncore/settings/mediummount/mainwindow.cc,v +retrieving revision 1.7 +diff -u -r1.7 mainwindow.cc +--- mediummount/mainwindow.cc 19 Sep 2004 19:11:07 -0000 1.7 ++++ mediummount/mainwindow.cc 14 Jun 2006 15:30:05 -0000 +@@ -1,5 +1,6 @@ + + ++#include <qpe/config.h> + #include <qtabwidget.h> + #include <qlayout.h> + #include <qtooltip.h> +@@ -20,15 +21,20 @@ + : QDialog( parent, name, modal, WStyle_ContextHelp ) + + { +- setCaption ( tr( "Medium Mount Settings" )); ++ Config c( "qpe" ); ++ c.setGroup( "Startup" ); ++ if ( c.readNumEntry( "FirstUse", 42 ) != 0 ) ++ { ++ setCaption ( tr( "Medium Mount Settings" )); + +- m_lay = new QVBoxLayout( this ); ++ m_lay = new QVBoxLayout( this ); + +- m_tab = new QTabWidget( this ); ++ m_tab = new QTabWidget( this ); + +- m_lay->addWidget( m_tab ); ++ m_lay->addWidget( m_tab ); + +- init(); ++ init(); ++ } + } + + MainWindow::~MainWindow() diff --git a/packages/opie-mediummount/opie-mediummount_1.2.1.bb b/packages/opie-mediummount/opie-mediummount_1.2.1.bb index 0c887950a8..0eaff4ad86 100644 --- a/packages/opie-mediummount/opie-mediummount_1.2.1.bb +++ b/packages/opie-mediummount/opie-mediummount_1.2.1.bb @@ -1,7 +1,8 @@ include ${PN}.inc - - + +PR = "r1" SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/mediummount \ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" + ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \ + file://firststart-no-popup.patch;patch=1" |