author | wimpie <wimpie> | 2005-01-09 03:02:21 (UTC) |
---|---|---|
committer | wimpie <wimpie> | 2005-01-09 03:02:21 (UTC) |
commit | 67d1d0b292553af550219d770cbd5c00987d8b8b (patch) (unidiff) | |
tree | 517759c7fbda44a40ff733e3b5d5667d90558caa /core | |
parent | 987bc9a2c5b39ddd4dc2a665cea65688bfd2179e (diff) | |
download | opie-67d1d0b292553af550219d770cbd5c00987d8b8b.zip opie-67d1d0b292553af550219d770cbd5c00987d8b8b.tar.gz opie-67d1d0b292553af550219d770cbd5c00987d8b8b.tar.bz2 |
CONTROL files : reset version to 'standard' format
(partly rolls back my drastic
all-applicatoins-same-version change)
now format is x.y(.z)$EXTRAVERSION
where x.y (and aptionally .z)
are x : major version
y : minor version
z : application patch
and extra version is seconds-since-epoch
this value can be used to automatically
upgrade versions with minor changes (without
manual update of the control file)
-rw-r--r-- | core/multimedia/opieplayer/modplug/opie-modplugin.control | 2 | ||||
-rw-r--r-- | core/pim/addressbook/addressbook.cpp | 2 | ||||
-rw-r--r-- | core/pim/today/task-opie-today.control | 2 | ||||
-rw-r--r-- | core/settings/security/demo/multiauth.control | 2 | ||||
-rw-r--r-- | core/tools/quicklauncher/main.cpp | 3 |
5 files changed, 5 insertions, 6 deletions
diff --git a/core/multimedia/opieplayer/modplug/opie-modplugin.control b/core/multimedia/opieplayer/modplug/opie-modplugin.control index 9e0957b..6e9ad7c 100644 --- a/core/multimedia/opieplayer/modplug/opie-modplugin.control +++ b/core/multimedia/opieplayer/modplug/opie-modplugin.control | |||
@@ -1,10 +1,10 @@ | |||
1 | Package: opie-modplugin | 1 | Package: opie-modplugin |
2 | Files: plugins/codecs/libmodplugin.so* | 2 | Files: plugins/codecs/libmodplugin.so* |
3 | Priority: optional | 3 | Priority: optional |
4 | Section: libs | 4 | Section: libs |
5 | Maintainer: Simon Hausmann <hausmann@kde.org>, L.J. Potter <lpotter@trolltech.com> | 5 | Maintainer: Simon Hausmann <hausmann@kde.org>, L.J. Potter <lpotter@trolltech.com> |
6 | Architecture: arm | 6 | Architecture: arm |
7 | Version: $QPE_VERSION$EXTRAVERSION | 7 | Version: 2.0.2-$EXTRAVERSION |
8 | Depends: task-opie-minimal | 8 | Depends: task-opie-minimal |
9 | Description: MOD/XM/S3M/IT plugin using libmodplug | 9 | Description: MOD/XM/S3M/IT plugin using libmodplug |
10 | Plugin to play MOD/XM/S3M/IT amiga tracker modules with the mediaplayer in the Opie environment. | 10 | Plugin to play MOD/XM/S3M/IT amiga tracker modules with the mediaplayer in the Opie environment. |
diff --git a/core/pim/addressbook/addressbook.cpp b/core/pim/addressbook/addressbook.cpp index 0654e1a..3f0ac74 100644 --- a/core/pim/addressbook/addressbook.cpp +++ b/core/pim/addressbook/addressbook.cpp | |||
@@ -62,17 +62,17 @@ AddressbookWindow::AddressbookWindow( QWidget *parent, const char *name, | |||
62 | m_tableViewButton(0l), | 62 | m_tableViewButton(0l), |
63 | m_cardViewButton(0l) | 63 | m_cardViewButton(0l) |
64 | { | 64 | { |
65 | isLoading = true; | 65 | isLoading = true; |
66 | 66 | ||
67 | m_config.load(); | 67 | m_config.load(); |
68 | 68 | ||
69 | setCaption( tr("Contacts") ); | 69 | setCaption( tr("Contacts") ); |
70 | setIcon( Resource::loadPixmap( "AddressBook" ) ); | 70 | setIcon( Resource::loadPixmap( "addressbook/AddressBook" ) ); |
71 | 71 | ||
72 | // Settings for Main Menu | 72 | // Settings for Main Menu |
73 | // setToolBarsMovable( false ); | 73 | // setToolBarsMovable( false ); |
74 | setToolBarsMovable( !m_config.fixedBars() ); | 74 | setToolBarsMovable( !m_config.fixedBars() ); |
75 | setRightJustification( true ); | 75 | setRightJustification( true ); |
76 | 76 | ||
77 | QToolBar *bar = new QToolBar( this ); | 77 | QToolBar *bar = new QToolBar( this ); |
78 | bar->setHorizontalStretchable( TRUE ); | 78 | bar->setHorizontalStretchable( TRUE ); |
diff --git a/core/pim/today/task-opie-today.control b/core/pim/today/task-opie-today.control index 6798141..3d637cc 100644 --- a/core/pim/today/task-opie-today.control +++ b/core/pim/today/task-opie-today.control | |||
@@ -1,12 +1,12 @@ | |||
1 | Package: task-opie-today | 1 | Package: task-opie-today |
2 | Priority: optional | 2 | Priority: optional |
3 | Section: opie/pim | 3 | Section: opie/pim |
4 | Maintainer: Maximilian Reiß <harlekin@handhelds.org> | 4 | Maintainer: Maximilian Reiß <harlekin@handhelds.org> |
5 | Architecture: arm | 5 | Architecture: arm |
6 | Version: $QPE_VERSION$EXTRAVERSION | 6 | Version: 0.5$EXTRAVERSION |
7 | Depends: task-opie-minimal, opie-today, opie-today-datebookplugin, opie-today-todolistplugin | 7 | Depends: task-opie-minimal, opie-today, opie-today-datebookplugin, opie-today-todolistplugin |
8 | License: GPL | 8 | License: GPL |
9 | Description: Task for basic Today app setup | 9 | Description: Task for basic Today app setup |
10 | Includes datebook and todolist plugins. | 10 | Includes datebook and todolist plugins. |
11 | 11 | ||
12 | Files: | 12 | Files: |
diff --git a/core/settings/security/demo/multiauth.control b/core/settings/security/demo/multiauth.control index c7dd82a..c549035 100644 --- a/core/settings/security/demo/multiauth.control +++ b/core/settings/security/demo/multiauth.control | |||
@@ -1,15 +1,15 @@ | |||
1 | Package: opie-multiauth | 1 | Package: opie-multiauth |
2 | Files: bin/multiauth apps/Applications/multiauth.desktop pics/security/multiauth.png | 2 | Files: bin/multiauth apps/Applications/multiauth.desktop pics/security/multiauth.png |
3 | Priority: optional | 3 | Priority: optional |
4 | Section: opie/settings | 4 | Section: opie/settings |
5 | Maintainer: Clement Seveillac <clement@nist.gov> | 5 | Maintainer: Clement Seveillac <clement@nist.gov> |
6 | Architecture: arm | 6 | Architecture: arm |
7 | Version: $QPE_VERSION$EXTRAVERSION | 7 | Version: 0.0.2$EXTRAVERSION |
8 | Depends: opie-security | 8 | Depends: opie-security |
9 | Description: multi-plugin authentication demonstrator for Opie. | 9 | Description: multi-plugin authentication demonstrator for Opie. |
10 | This demonstration application allows us to use one or several | 10 | This demonstration application allows us to use one or several |
11 | ways to lock and unlock our device. Since it really locks your | 11 | ways to lock and unlock our device. Since it really locks your |
12 | PDA the way you configured it in the Security settings, you can | 12 | PDA the way you configured it in the Security settings, you can |
13 | map a button to it through the Buttons settings to lock your | 13 | map a button to it through the Buttons settings to lock your |
14 | PDA on demand, with one simple click. | 14 | PDA on demand, with one simple click. |
15 | You must install some opie-multiauth-* plugins, and configure | 15 | You must install some opie-multiauth-* plugins, and configure |
diff --git a/core/tools/quicklauncher/main.cpp b/core/tools/quicklauncher/main.cpp index fbed5a1..59dd17e 100644 --- a/core/tools/quicklauncher/main.cpp +++ b/core/tools/quicklauncher/main.cpp | |||
@@ -112,18 +112,17 @@ public: | |||
112 | static void exec( int /*argc*/, char **argv ) | 112 | static void exec( int /*argc*/, char **argv ) |
113 | { | 113 | { |
114 | QString appName = argv[0]; | 114 | QString appName = argv[0]; |
115 | int sep = appName.findRev( '/' ); | 115 | int sep = appName.findRev( '/' ); |
116 | if ( sep > 0 ) | 116 | if ( sep > 0 ) |
117 | appName = appName.mid( sep+1 ); | 117 | appName = appName.mid( sep+1 ); |
118 | 118 | ||
119 | appIface = 0; | 119 | appIface = 0; |
120 | if ( loader->queryInterface(appName, IID_QtopiaApplication, (QUnknownInterface**)&appIface) != QS_OK ) { | 120 | if ( ! ( loader->queryInterface(appName, IID_QtopiaApplication, (QUnknownInterface**)&appIface) == QS_OK ) ) { |
121 | owarn << "Plugin does not support QuickLauncher interface" << oendl; | ||
122 | exit(-1); | 121 | exit(-1); |
123 | } | 122 | } |
124 | 123 | ||
125 | mainWindow = appIface->createMainWindow( appName ); | 124 | mainWindow = appIface->createMainWindow( appName ); |
126 | 125 | ||
127 | if ( mainWindow ) { | 126 | if ( mainWindow ) { |
128 | if ( mainWindow->metaObject()->slotNames().contains("setDocument(const QString&)") ) { | 127 | if ( mainWindow->metaObject()->slotNames().contains("setDocument(const QString&)") ) { |
129 | app->showMainDocumentWidget( mainWindow ); | 128 | app->showMainDocumentWidget( mainWindow ); |