author | harlekin <harlekin> | 2002-09-20 23:27:04 (UTC) |
---|---|---|
committer | harlekin <harlekin> | 2002-09-20 23:27:04 (UTC) |
commit | cd3df897c1b0ed93c2be3ab411011a0bdfe88bf9 (patch) (unidiff) | |
tree | d8a96a55e9de74a790ede52dc73554594cfa55e4 | |
parent | d5db444cb70986baceda8ad1e01b0fb8384d12b4 (diff) | |
download | opie-cd3df897c1b0ed93c2be3ab411011a0bdfe88bf9.zip opie-cd3df897c1b0ed93c2be3ab411011a0bdfe88bf9.tar.gz opie-cd3df897c1b0ed93c2be3ab411011a0bdfe88bf9.tar.bz2 |
make the order tab default shown in config dialog
-rw-r--r-- | core/pim/today/todayconfig.cpp | 6 | ||||
-rw-r--r-- | core/pim/today/todayconfig.h | 1 |
2 files changed, 6 insertions, 1 deletions
diff --git a/core/pim/today/todayconfig.cpp b/core/pim/today/todayconfig.cpp index 04f595b..472da50 100644 --- a/core/pim/today/todayconfig.cpp +++ b/core/pim/today/todayconfig.cpp | |||
@@ -69,48 +69,50 @@ TodayConfig::TodayConfig( QWidget* parent, const char* name, bool modal, WFlags | |||
69 | m_appletListView->setSorting( -1 ); | 69 | m_appletListView->setSorting( -1 ); |
70 | QVBox *vbox1 = new QVBox( hbox1 ); | 70 | QVBox *vbox1 = new QVBox( hbox1 ); |
71 | new ToolButton( vbox1, tr( "Move Up" ), "opieplayer/up", this , SLOT( moveSelectedUp() ) ); | 71 | new ToolButton( vbox1, tr( "Move Up" ), "opieplayer/up", this , SLOT( moveSelectedUp() ) ); |
72 | new ToolButton( vbox1, tr( "Move Down" ),"opieplayer/down", this , SLOT( moveSelectedDown() ) ); | 72 | new ToolButton( vbox1, tr( "Move Down" ),"opieplayer/down", this , SLOT( moveSelectedDown() ) ); |
73 | tab2Layout->addWidget( hbox1 ); | 73 | tab2Layout->addWidget( hbox1 ); |
74 | TabWidget3->addTab( tab_2, "pass", tr( "active/order" ) ); | 74 | TabWidget3->addTab( tab_2, "pass", tr( "active/order" ) ); |
75 | 75 | ||
76 | tab_3 = new QWidget( TabWidget3, "tab_3" ); | 76 | tab_3 = new QWidget( TabWidget3, "tab_3" ); |
77 | QVBoxLayout *tab3Layout = new QVBoxLayout( tab_3 ); | 77 | QVBoxLayout *tab3Layout = new QVBoxLayout( tab_3 ); |
78 | tab3Layout->setMargin( 20 ); | 78 | tab3Layout->setMargin( 20 ); |
79 | QHBox *hbox_auto = new QHBox( tab_3 ); | 79 | QHBox *hbox_auto = new QHBox( tab_3 ); |
80 | TextLabel2 = new QLabel( hbox_auto, "AutoStart" ); | 80 | TextLabel2 = new QLabel( hbox_auto, "AutoStart" ); |
81 | TextLabel2->setText( tr( "autostart on \nresume?\n (Opie only)" ) ); | 81 | TextLabel2->setText( tr( "autostart on \nresume?\n (Opie only)" ) ); |
82 | CheckBoxAuto = new QCheckBox( hbox_auto, "CheckBoxAuto" ); | 82 | CheckBoxAuto = new QCheckBox( hbox_auto, "CheckBoxAuto" ); |
83 | QHBox *hbox_inactive = new QHBox( tab_3 ); | 83 | QHBox *hbox_inactive = new QHBox( tab_3 ); |
84 | TimeLabel = new QLabel( hbox_inactive , "TimeLabel" ); | 84 | TimeLabel = new QLabel( hbox_inactive , "TimeLabel" ); |
85 | TimeLabel->setText( tr( "minutes inactive" ) ); | 85 | TimeLabel->setText( tr( "minutes inactive" ) ); |
86 | SpinBoxTime = new QSpinBox( hbox_inactive, "TimeSpinner" ); | 86 | SpinBoxTime = new QSpinBox( hbox_inactive, "TimeSpinner" ); |
87 | tab3Layout->addWidget( hbox_auto ); | 87 | tab3Layout->addWidget( hbox_auto ); |
88 | tab3Layout->addWidget( hbox_inactive ); | 88 | tab3Layout->addWidget( hbox_inactive ); |
89 | TabWidget3->addTab( tab_3, "SettingsIcon", tr( "Misc" ) ); | 89 | TabWidget3->addTab( tab_3, "SettingsIcon", tr( "Misc" ) ); |
90 | 90 | ||
91 | m_applets_changed = false; | 91 | m_applets_changed = false; |
92 | 92 | ||
93 | // TabWidget3->setCurrentTab( tab_2 ); | ||
94 | |||
93 | connect ( m_appletListView , SIGNAL( clicked ( QListViewItem * ) ), this, SLOT( appletChanged ( ) ) ); | 95 | connect ( m_appletListView , SIGNAL( clicked ( QListViewItem * ) ), this, SLOT( appletChanged ( ) ) ); |
94 | 96 | ||
95 | readConfig(); | 97 | readConfig(); |
96 | showMaximized(); | 98 | showMaximized(); |
97 | } | 99 | } |
98 | 100 | ||
99 | 101 | ||
100 | /** | 102 | /** |
101 | * Autostart, uses the new (opie only) autostart method in the launcher code. | 103 | * Autostart, uses the new (opie only) autostart method in the launcher code. |
102 | * If registered against that today ist started on each resume. | 104 | * If registered against that today ist started on each resume. |
103 | */ | 105 | */ |
104 | void TodayConfig::setAutoStart() { | 106 | void TodayConfig::setAutoStart() { |
105 | Config cfg( "today" ); | 107 | Config cfg( "today" ); |
106 | cfg.setGroup( "Autostart" ); | 108 | cfg.setGroup( "Autostart" ); |
107 | int autostart = cfg.readNumEntry( "autostart", 1 ); | 109 | int autostart = cfg.readNumEntry( "autostart", 1 ); |
108 | if ( autostart ) { | 110 | if ( autostart ) { |
109 | QCopEnvelope e( "QPE/System", "autoStart(QString,QString,QString)" ); | 111 | QCopEnvelope e( "QPE/System", "autoStart(QString,QString,QString)" ); |
110 | e << QString( "add" ); | 112 | e << QString( "add" ); |
111 | e << QString( "today" ); | 113 | e << QString( "today" ); |
112 | e << m_autoStartTimer; | 114 | e << m_autoStartTimer; |
113 | } else { | 115 | } else { |
114 | QCopEnvelope e( "QPE/System", "autoStart(QString,QString)" ); | 116 | QCopEnvelope e( "QPE/System", "autoStart(QString,QString)" ); |
115 | e << QString( "remove" ); | 117 | e << QString( "remove" ); |
116 | e << QString( "today" ); | 118 | e << QString( "today" ); |
@@ -184,35 +186,37 @@ void TodayConfig::moveSelectedDown() { | |||
184 | QListViewItem *item = m_appletListView->selectedItem(); | 186 | QListViewItem *item = m_appletListView->selectedItem(); |
185 | if ( item && item->itemBelow() ) { | 187 | if ( item && item->itemBelow() ) { |
186 | item->moveItem( item->itemBelow() ); | 188 | item->moveItem( item->itemBelow() ); |
187 | } | 189 | } |
188 | } | 190 | } |
189 | 191 | ||
190 | 192 | ||
191 | /** | 193 | /** |
192 | * Set up the | 194 | * Set up the |
193 | */ | 195 | */ |
194 | void TodayConfig::pluginManagement( QString libName, QString name, QPixmap icon ) { | 196 | void TodayConfig::pluginManagement( QString libName, QString name, QPixmap icon ) { |
195 | 197 | ||
196 | QCheckListItem *item; | 198 | QCheckListItem *item; |
197 | item = new QCheckListItem( m_appletListView, name, QCheckListItem::CheckBox ); | 199 | item = new QCheckListItem( m_appletListView, name, QCheckListItem::CheckBox ); |
198 | 200 | ||
199 | if ( !icon.isNull() ) { | 201 | if ( !icon.isNull() ) { |
200 | item->setPixmap( 0, icon ); | 202 | item->setPixmap( 0, icon ); |
201 | } | 203 | } |
202 | 204 | ||
203 | if ( m_excludeApplets.find( libName ) == m_excludeApplets.end() ) { | 205 | if ( m_excludeApplets.find( libName ) == m_excludeApplets.end() ) { |
204 | item->setOn( TRUE ); | 206 | item->setOn( TRUE ); |
205 | } | 207 | } |
206 | 208 | ||
207 | m_applets[libName] = item; | 209 | m_applets[libName] = item; |
208 | } | ||
209 | 210 | ||
211 | // kind of hack to get the first tab as default. | ||
212 | TabWidget3->setCurrentTab( tab_2 ); | ||
213 | } | ||
210 | 214 | ||
211 | void TodayConfig::appletChanged() { | 215 | void TodayConfig::appletChanged() { |
212 | m_applets_changed = true; | 216 | m_applets_changed = true; |
213 | } | 217 | } |
214 | 218 | ||
215 | 219 | ||
216 | TodayConfig::~TodayConfig() { | 220 | TodayConfig::~TodayConfig() { |
217 | } | 221 | } |
218 | 222 | ||
diff --git a/core/pim/today/todayconfig.h b/core/pim/today/todayconfig.h index 49cd10f..7c261bd 100644 --- a/core/pim/today/todayconfig.h +++ b/core/pim/today/todayconfig.h | |||
@@ -19,48 +19,49 @@ | |||
19 | 19 | ||
20 | #include <qvariant.h> | 20 | #include <qvariant.h> |
21 | #include <qdialog.h> | 21 | #include <qdialog.h> |
22 | #include <qlistview.h> | 22 | #include <qlistview.h> |
23 | #include <opie/otabwidget.h> | 23 | #include <opie/otabwidget.h> |
24 | 24 | ||
25 | class QCheckBox; | 25 | class QCheckBox; |
26 | class QLabel; | 26 | class QLabel; |
27 | class QSpinBox; | 27 | class QSpinBox; |
28 | class QTabWidget; | 28 | class QTabWidget; |
29 | 29 | ||
30 | class TodayConfig : public QDialog { | 30 | class TodayConfig : public QDialog { |
31 | 31 | ||
32 | Q_OBJECT | 32 | Q_OBJECT |
33 | 33 | ||
34 | public: | 34 | public: |
35 | TodayConfig( QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); | 35 | TodayConfig( QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); |
36 | ~TodayConfig(); | 36 | ~TodayConfig(); |
37 | 37 | ||
38 | OTabWidget* TabWidget3; | 38 | OTabWidget* TabWidget3; |
39 | 39 | ||
40 | void writeConfig(); | 40 | void writeConfig(); |
41 | void pluginManagement( QString libName, QString name, QPixmap icon ); | 41 | void pluginManagement( QString libName, QString name, QPixmap icon ); |
42 | 42 | ||
43 | |||
43 | protected slots: | 44 | protected slots: |
44 | void appletChanged(); | 45 | void appletChanged(); |
45 | void moveSelectedUp(); | 46 | void moveSelectedUp(); |
46 | void moveSelectedDown(); | 47 | void moveSelectedDown(); |
47 | 48 | ||
48 | private: | 49 | private: |
49 | void setAutoStart(); | 50 | void setAutoStart(); |
50 | void readConfig(); | 51 | void readConfig(); |
51 | 52 | ||
52 | QListView* m_appletListView; | 53 | QListView* m_appletListView; |
53 | QMap<QString,QCheckListItem*> m_applets; | 54 | QMap<QString,QCheckListItem*> m_applets; |
54 | 55 | ||
55 | int m_autoStart; | 56 | int m_autoStart; |
56 | QString m_autoStartTimer; | 57 | QString m_autoStartTimer; |
57 | QStringList m_excludeApplets; | 58 | QStringList m_excludeApplets; |
58 | bool m_applets_changed; | 59 | bool m_applets_changed; |
59 | 60 | ||
60 | QLabel* TextLabel2; | 61 | QLabel* TextLabel2; |
61 | QCheckBox* CheckBoxAuto; | 62 | QCheckBox* CheckBoxAuto; |
62 | QWidget* tab_2; | 63 | QWidget* tab_2; |
63 | QWidget* tab_3; | 64 | QWidget* tab_3; |
64 | QLabel* TextLabel1; | 65 | QLabel* TextLabel1; |
65 | QSpinBox* SpinBox7; | 66 | QSpinBox* SpinBox7; |
66 | QLabel* TimeLabel; | 67 | QLabel* TimeLabel; |