author | mickeyl <mickeyl> | 2003-10-29 17:22:08 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2003-10-29 17:22:08 (UTC) |
commit | 35615947e11575a61456c8483e7f6d67fe59d5ed (patch) (side-by-side diff) | |
tree | 89f834a50b5070767ca0f9c8a90d044f075a9131 /noncore/settings/appearance2 | |
parent | 80fc44ae81d88c4cee5ea160818881acb2422a62 (diff) | |
download | opie-35615947e11575a61456c8483e7f6d67fe59d5ed.zip opie-35615947e11575a61456c8483e7f6d67fe59d5ed.tar.gz opie-35615947e11575a61456c8483e7f6d67fe59d5ed.tar.bz2 |
merge noncore/settings/* except networksettings for which tille volunteered (thanks)
Diffstat (limited to 'noncore/settings/appearance2') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/settings/appearance2/appearance.cpp | 4 | ||||
-rw-r--r-- | noncore/settings/appearance2/appearance.h | 3 | ||||
-rw-r--r-- | noncore/settings/appearance2/appearance2.pro | 8 | ||||
-rw-r--r-- | noncore/settings/appearance2/main.cpp | 14 |
4 files changed, 8 insertions, 21 deletions
diff --git a/noncore/settings/appearance2/appearance.cpp b/noncore/settings/appearance2/appearance.cpp index 00128d3..9e5eede 100644 --- a/noncore/settings/appearance2/appearance.cpp +++ b/noncore/settings/appearance2/appearance.cpp @@ -561,16 +561,12 @@ void Appearance::accept ( ) config. writeEntry ( "NoStyle", sl, ';' ); config. writeEntry ( "ForceStyle", m_force-> isChecked ( )); config. write ( ); // need to flush the config info first Global::applyStyle ( ); - if ( QMessageBox::warning ( this, tr( "Restart" ), tr( "Do you want to restart %1 now?" ). arg ( ODevice::inst ( )-> system ( ) == System_Zaurus ? "Qtopia" : "Opie" ), tr( "Yes" ), tr( "No" ), 0, 0, 1 ) == 0 ) { - QCopEnvelope e( "QPE/System", "restart()" ); - } - QDialog::accept ( ); } void Appearance::done ( int r ) { QDialog::done ( r ); diff --git a/noncore/settings/appearance2/appearance.h b/noncore/settings/appearance2/appearance.h index da9e976..51e9636 100644 --- a/noncore/settings/appearance2/appearance.h +++ b/noncore/settings/appearance2/appearance.h @@ -52,17 +52,18 @@ class Appearance : public QDialog { Q_OBJECT public: Appearance( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); ~Appearance(); + static QString appName() { return QString::fromLatin1("appearance"); } protected: virtual void accept ( ); virtual void done ( int r ); - + protected slots: void styleClicked ( int ); void styleSettingsClicked ( ); void decoClicked ( int ); void fontClicked ( const QFont & ); void colorClicked ( int ); diff --git a/noncore/settings/appearance2/appearance2.pro b/noncore/settings/appearance2/appearance2.pro index e37536d..145de2f 100644 --- a/noncore/settings/appearance2/appearance2.pro +++ b/noncore/settings/appearance2/appearance2.pro @@ -1,18 +1,17 @@ -TEMPLATE = app -CONFIG = qt warn_on release -DESTDIR = $(OPIEDIR)/bin +CONFIG = qt warn_on release quick-app HEADERS = appearance.h editScheme.h sample.h SOURCES = appearance.cpp editScheme.cpp main.cpp sample.cpp INCLUDEPATH += $(OPIEDIR)/include DEPENDPATH += ../$(OPIEDIR)/include LIBS += -lqpe -lopie -TARGET = appearance INCLUDEPATH += $(OPIEDIR)/include DEPENDPATH += $(OPIEDIR)/include +TARGET = appearance + TRANSLATIONS = ../../../i18n/de/appearance.ts \ ../../../i18n/nl/appearance.ts \ ../../../i18n/xx/appearance.ts \ ../../../i18n/en/appearance.ts \ ../../../i18n/es/appearance.ts \ ../../../i18n/fr/appearance.ts \ @@ -26,8 +25,7 @@ TRANSLATIONS = ../../../i18n/de/appearance.ts \ ../../../i18n/sl/appearance.ts \ ../../../i18n/zh_CN/appearance.ts \ ../../../i18n/zh_TW/appearance.ts \ ../../../i18n/da/appearance.ts - include ( $(OPIEDIR)/include.pro ) diff --git a/noncore/settings/appearance2/main.cpp b/noncore/settings/appearance2/main.cpp index ad24cf3..5595429 100644 --- a/noncore/settings/appearance2/main.cpp +++ b/noncore/settings/appearance2/main.cpp @@ -12,31 +12,23 @@ .i_,=:_. -<s. This file is distributed in the hope that + . -:. = it will be useful, but WITHOUT ANY WARRANTY; : .. .:, . . . without even the implied warranty of =_ + =;=|` MERCHANTABILITY or FITNESS FOR A _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU General ..}^=.= = ; Public License for more details. -++= -. .` .: +++= -. .` .: : = ...= . :.=- You should have received a copy of the GNU -. .:....=;==+<; General Public License along with this file; -_. . . )=. = see the file COPYING. If not, write to the -- :-=` Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include "appearance.h" #include <qpe/qpeapplication.h> +#include <opie/oapplicationfactory.h> -int main ( int argc, char **argv ) -{ - QPEApplication app ( argc, argv ); - - Appearance m; - app. showMainDocumentWidget ( &m ); - - return app. exec ( ); -} - +OPIE_EXPORT_APP( OApplicationFactory<Appearance> ) |