author | leseb <leseb> | 2002-07-08 14:58:34 (UTC) |
---|---|---|
committer | leseb <leseb> | 2002-07-08 14:58:34 (UTC) |
commit | 8b6a15ef84bc6b1c9c1a82689788c6e281780495 (patch) (unidiff) | |
tree | 1d2c2f416aab46103d244a0b9d5b1c764c9f5452 /noncore | |
parent | c92049007eaf6615a059425073b03a827d11831e (diff) | |
download | opie-8b6a15ef84bc6b1c9c1a82689788c6e281780495.zip opie-8b6a15ef84bc6b1c9c1a82689788c6e281780495.tar.gz opie-8b6a15ef84bc6b1c9c1a82689788c6e281780495.tar.bz2 |
Sync with 1.2 version + some bug fixes
-rw-r--r-- | noncore/settings/tabmanager/app.cpp | 83 | ||||
-rw-r--r-- | noncore/settings/tabmanager/app.h | 41 | ||||
-rw-r--r-- | noncore/settings/tabmanager/opie-tabmanager.control | 8 | ||||
-rw-r--r-- | noncore/settings/tabmanager/tabapplnk.h | 0 | ||||
-rw-r--r-- | noncore/settings/tabmanager/tablistview.h | 0 | ||||
-rw-r--r-- | noncore/settings/tabmanager/tabmainwindow.h | 7 | ||||
-rw-r--r-- | noncore/settings/tabmanager/tabmanager.cpp | 127 | ||||
-rw-r--r-- | noncore/settings/tabmanager/tabmanager.h | 4 | ||||
-rw-r--r-- | noncore/settings/tabmanager/tabmanager.pro | 7 | ||||
-rw-r--r-- | noncore/settings/tabmanager/tabmanagerbase.cpp | 9 | ||||
-rw-r--r-- | noncore/settings/tabmanager/tabmanagerbase.ui | 22 |
11 files changed, 114 insertions, 194 deletions
diff --git a/noncore/settings/tabmanager/app.cpp b/noncore/settings/tabmanager/app.cpp deleted file mode 100644 index 30ba9a5..0000000 --- a/noncore/settings/tabmanager/app.cpp +++ b/dev/null | |||
@@ -1,83 +0,0 @@ | |||
1 | /**************************************************************************** | ||
2 | ** Form implementation generated from reading ui file 'app.ui' | ||
3 | ** | ||
4 | ** Created: Fri May 3 14:38:15 2002 | ||
5 | ** by: The User Interface Compiler (uic) | ||
6 | ** | ||
7 | ** WARNING! All changes made in this file will be lost! | ||
8 | ****************************************************************************/ | ||
9 | #include "app.h" | ||
10 | |||
11 | #include <qlabel.h> | ||
12 | #include <qlineedit.h> | ||
13 | #include <qpushbutton.h> | ||
14 | #include <qlayout.h> | ||
15 | #include <qvariant.h> | ||
16 | #include <qtooltip.h> | ||
17 | #include <qwhatsthis.h> | ||
18 | |||
19 | /* | ||
20 | * Constructs a AppEdit which is a child of 'parent', with the | ||
21 | * name 'name' and widget flags set to 'f' | ||
22 | * | ||
23 | * The dialog will by default be modeless, unless you set 'modal' to | ||
24 | * TRUE to construct a modal dialog. | ||
25 | */ | ||
26 | AppEdit::AppEdit( QWidget* parent, const char* name, bool modal, WFlags fl ) | ||
27 | : QDialog( parent, name, modal, fl ) | ||
28 | { | ||
29 | if ( !name ) | ||
30 | setName( "AppEdit" ); | ||
31 | resize( 211, 241 ); | ||
32 | setCaption( tr( "Application" ) ); | ||
33 | AppEditLayout = new QGridLayout( this ); | ||
34 | AppEditLayout->setSpacing( 6 ); | ||
35 | AppEditLayout->setMargin( 11 ); | ||
36 | |||
37 | TextLabel3 = new QLabel( this, "TextLabel3" ); | ||
38 | TextLabel3->setText( tr( "Exec" ) ); | ||
39 | |||
40 | AppEditLayout->addWidget( TextLabel3, 2, 0 ); | ||
41 | |||
42 | TextLabel4 = new QLabel( this, "TextLabel4" ); | ||
43 | TextLabel4->setText( tr( "Comment" ) ); | ||
44 | |||
45 | AppEditLayout->addWidget( TextLabel4, 3, 0 ); | ||
46 | |||
47 | TextLabel2 = new QLabel( this, "TextLabel2" ); | ||
48 | TextLabel2->setText( tr( "Icon" ) ); | ||
49 | |||
50 | AppEditLayout->addWidget( TextLabel2, 1, 0 ); | ||
51 | |||
52 | TextLabel1 = new QLabel( this, "TextLabel1" ); | ||
53 | TextLabel1->setText( tr( "Name" ) ); | ||
54 | |||
55 | AppEditLayout->addWidget( TextLabel1, 0, 0 ); | ||
56 | |||
57 | iconLineEdit = new QLineEdit( this, "iconLineEdit" ); | ||
58 | |||
59 | AppEditLayout->addWidget( iconLineEdit, 1, 1 ); | ||
60 | |||
61 | nameLineEdit = new QLineEdit( this, "nameLineEdit" ); | ||
62 | |||
63 | AppEditLayout->addWidget( nameLineEdit, 0, 1 ); | ||
64 | |||
65 | commentLineEdit = new QLineEdit( this, "commentLineEdit" ); | ||
66 | |||
67 | AppEditLayout->addWidget( commentLineEdit, 3, 1 ); | ||
68 | |||
69 | execLineEdit = new QLineEdit( this, "execLineEdit" ); | ||
70 | |||
71 | AppEditLayout->addWidget( execLineEdit, 2, 1 ); | ||
72 | QSpacerItem* spacer = new QSpacerItem( 20, 20, QSizePolicy::Minimum, QSizePolicy::Expanding ); | ||
73 | AppEditLayout->addItem( spacer, 4, 1 ); | ||
74 | } | ||
75 | |||
76 | /* | ||
77 | * Destroys the object and frees any allocated resources | ||
78 | */ | ||
79 | AppEdit::~AppEdit() | ||
80 | { | ||
81 | // no need to delete child widgets, Qt does it all for us | ||
82 | } | ||
83 | |||
diff --git a/noncore/settings/tabmanager/app.h b/noncore/settings/tabmanager/app.h deleted file mode 100644 index ffa6222..0000000 --- a/noncore/settings/tabmanager/app.h +++ b/dev/null | |||
@@ -1,41 +0,0 @@ | |||
1 | /**************************************************************************** | ||
2 | ** Form interface generated from reading ui file 'app.ui' | ||
3 | ** | ||
4 | ** Created: Fri May 3 14:38:09 2002 | ||
5 | ** by: The User Interface Compiler (uic) | ||
6 | ** | ||
7 | ** WARNING! All changes made in this file will be lost! | ||
8 | ****************************************************************************/ | ||
9 | #ifndef APPEDIT_H | ||
10 | #define APPEDIT_H | ||
11 | |||
12 | #include <qvariant.h> | ||
13 | #include <qdialog.h> | ||
14 | class QVBoxLayout; | ||
15 | class QHBoxLayout; | ||
16 | class QGridLayout; | ||
17 | class QLabel; | ||
18 | class QLineEdit; | ||
19 | |||
20 | class AppEdit : public QDialog | ||
21 | { | ||
22 | Q_OBJECT | ||
23 | |||
24 | public: | ||
25 | AppEdit( QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); | ||
26 | ~AppEdit(); | ||
27 | |||
28 | QLabel* TextLabel3; | ||
29 | QLabel* TextLabel4; | ||
30 | QLabel* TextLabel2; | ||
31 | QLabel* TextLabel1; | ||
32 | QLineEdit* iconLineEdit; | ||
33 | QLineEdit* nameLineEdit; | ||
34 | QLineEdit* commentLineEdit; | ||
35 | QLineEdit* execLineEdit; | ||
36 | |||
37 | protected: | ||
38 | QGridLayout* AppEditLayout; | ||
39 | }; | ||
40 | |||
41 | #endif // APPEDIT_H | ||
diff --git a/noncore/settings/tabmanager/opie-tabmanager.control b/noncore/settings/tabmanager/opie-tabmanager.control index 0d5c1e7..610a281 100644 --- a/noncore/settings/tabmanager/opie-tabmanager.control +++ b/noncore/settings/tabmanager/opie-tabmanager.control | |||
@@ -2,8 +2,10 @@ Package: opie-tabmanager | |||
2 | Files: bin/tabmanager apps/Settings/tabmanager.desktop pics/tabmanager/tabmanager.png | 2 | Files: bin/tabmanager apps/Settings/tabmanager.desktop pics/tabmanager/tabmanager.png |
3 | Priority: optional | 3 | Priority: optional |
4 | Version: 1.0 | 4 | Section: opie/settings |
5 | Version: $QPE_VERSION-$SUB_VERSION-1.0 | ||
6 | Depends: opie-base ($QPE_VERSION) | ||
5 | Architecture: arm | 7 | Architecture: arm |
6 | Maintainer: Benjamin Meyer <meyerb@sharpsec.com> | 8 | Maintainer: Benjamin Meyer <meyerb@sharpsec.com> |
7 | Section: Settings | ||
8 | Description: Tab Manager | 9 | Description: Tab Manager |
9 | Helps to manage the Applications tab | 10 | Create new tabs, remove old tabs. Edit tab's name, comment and icon. |
11 | Edit applications name, exec, comment and icon. Add/remove applications. | ||
diff --git a/noncore/settings/tabmanager/tabapplnk.h b/noncore/settings/tabmanager/tabapplnk.h index 9333e87..375d33b 100644 --- a/noncore/settings/tabmanager/tabapplnk.h +++ b/noncore/settings/tabmanager/tabapplnk.h | |||
diff --git a/noncore/settings/tabmanager/tablistview.h b/noncore/settings/tabmanager/tablistview.h index 97f9dec..dfd88f7 100644 --- a/noncore/settings/tabmanager/tablistview.h +++ b/noncore/settings/tabmanager/tablistview.h | |||
diff --git a/noncore/settings/tabmanager/tabmainwindow.h b/noncore/settings/tabmanager/tabmainwindow.h index c76ad9f..69fb15d 100644 --- a/noncore/settings/tabmanager/tabmainwindow.h +++ b/noncore/settings/tabmanager/tabmainwindow.h | |||
@@ -14,12 +14,15 @@ public: | |||
14 | tabManager = new TabManager(this, "TabManger"); | 14 | tabManager = new TabManager(this, "TabManger"); |
15 | setCaption("Tab Manager"); | 15 | setCaption("Tab Manager"); |
16 | setToolBarsMovable(false); | ||
16 | this->setCentralWidget(tabManager); | 17 | this->setCentralWidget(tabManager); |
17 | QToolBar *newToolBar = new QToolBar("toolbar", this); | 18 | QToolBar *newToolBar = new QToolBar("toolbar", this); |
19 | QToolBar *emptyToolBar = new QToolBar("empty", this); | ||
20 | emptyToolBar->setHorizontalStretchable(true); | ||
18 | 21 | ||
19 | // Insert all of the buttons. | 22 | // Insert all of the buttons. |
20 | QToolButton *newFolder = new QToolButton(Resource::loadPixmap("fileopen"), "New Folder", 0, tabManager, SLOT(newFolder()), newToolBar); | 23 | QToolButton *newFolder = new QToolButton(Resource::loadPixmap("fileopen"), "New Folder", 0, tabManager, SLOT(newFolder()), newToolBar); |
21 | QToolButton *newFile = new QToolButton(Resource::loadPixmap("new"), "New Folder", 0, tabManager, SLOT(newApplication()), newToolBar); | 24 | QToolButton *newFile = new QToolButton(Resource::loadPixmap("new"), "New Application", 0, tabManager, SLOT(newApplication()), newToolBar); |
22 | QToolButton *editItem = new QToolButton(Resource::loadPixmap("edit"), "Edit", 0, tabManager, SLOT(editCurrentItem()), newToolBar); | 25 | QToolButton *editItem = new QToolButton(Resource::loadPixmap("edit"), "Edit", 0, tabManager, SLOT(editCurrentItem()), newToolBar); |
23 | QToolButton *deleteItem = new QToolButton(Resource::loadPixmap("reset"), "Deelete", 0, tabManager, SLOT(removeItem()), newToolBar); | 26 | QToolButton *deleteItem = new QToolButton(Resource::loadPixmap("trash"), "Delete", 0, tabManager, SLOT(removeItem()), newToolBar); |
24 | 27 | ||
25 | }; | 28 | }; |
diff --git a/noncore/settings/tabmanager/tabmanager.cpp b/noncore/settings/tabmanager/tabmanager.cpp index 13aae81..5f0899c 100644 --- a/noncore/settings/tabmanager/tabmanager.cpp +++ b/noncore/settings/tabmanager/tabmanager.cpp | |||
@@ -1,8 +1,8 @@ | |||
1 | #include "tabmanager.h" | 1 | #include "tabmanager.h" |
2 | #include "app.h" | 2 | #include "app.h" |
3 | #include "wait.h" | ||
3 | #include "tabapplnk.h" | 4 | #include "tabapplnk.h" |
4 | 5 | ||
5 | #include <qpe/applnk.h> | 6 | #include <qpe/applnk.h> |
6 | #include <qpe/qpeapplication.h> | ||
7 | #include <qdir.h> | 7 | #include <qdir.h> |
8 | #include <qfile.h> | 8 | #include <qfile.h> |
@@ -10,4 +10,5 @@ | |||
10 | #include <qlistview.h> | 10 | #include <qlistview.h> |
11 | #include <qheader.h> | 11 | #include <qheader.h> |
12 | #include <qcombobox.h> | ||
12 | #include <qlineedit.h> | 13 | #include <qlineedit.h> |
13 | #include <qlabel.h> | 14 | #include <qlabel.h> |
@@ -15,6 +16,9 @@ | |||
15 | #include <stdlib.h> | 16 | #include <stdlib.h> |
16 | #include <qpe/qcopenvelope_qws.h> | 17 | #include <qpe/qcopenvelope_qws.h> |
18 | #include <qpe/qpeapplication.h> | ||
19 | #include <qpe/resource.h> | ||
20 | |||
17 | 21 | ||
18 | #define HOME_APP_DIR QPEApplication::qpeDir()+"/apps" // <-- made this a little more flexible | 22 | #define HOME_APP_DIR QPEApplication::qpeDir()+"/apps" |
19 | #define HOME_APP_INSTALL_DIR "/usr/lib/ipkg/info" | 23 | #define HOME_APP_INSTALL_DIR "/usr/lib/ipkg/info" |
20 | #define NEW_FOLDER "EmptyTab" | 24 | #define NEW_FOLDER "EmptyTab" |
@@ -27,13 +31,11 @@ | |||
27 | * and tabs | 31 | * and tabs |
28 | */ | 32 | */ |
29 | TabManager::TabManager( QWidget* parent, const char* name):TabManagerBase(parent, name), changed(false){ | 33 | TabManager::TabManager( QWidget* parent, const char* name):TabManagerBase(parent, name), changed(false), application(NULL){ |
30 | rescanFolder(HOME_APP_DIR); | 34 | rescanFolder(HOME_APP_DIR); |
31 | 35 | ||
32 | // Connect the signals and slots | 36 | // Connect the signals and slots |
33 | connect(tabList, SIGNAL(doubleClicked(QListViewItem *)), | 37 | connect(tabList, SIGNAL(doubleClicked(QListViewItem *)), this, SLOT(editItem(QListViewItem*))); |
34 | this, SLOT(editItem(QListViewItem*))); | ||
35 | (tabList->header())->hide(); | 38 | (tabList->header())->hide(); |
36 | connect(tabList, SIGNAL(moveItem(QListViewItem *, QListViewItem *)), | 39 | connect(tabList, SIGNAL(moveItem(QListViewItem *, QListViewItem *)), this, SLOT(moveApplication(QListViewItem *, QListViewItem *))); |
37 | this, SLOT(moveApplication(QListViewItem *, QListViewItem *))); | ||
38 | } | 40 | } |
39 | 41 | ||
@@ -44,8 +46,9 @@ TabManager::TabManager( QWidget* parent, const char* name):TabManagerBase(parent | |||
44 | TabManager::~TabManager(){ | 46 | TabManager::~TabManager(){ |
45 | if(changed){ | 47 | if(changed){ |
46 | //QMessageBox::critical(this, tr("Message"), tr("Please restart Qtopia to see all new changes."),tr("Ok") ); | 48 | // Prompt. |
47 | //filename = fn; | 49 | //int answer = QMessageBox::warning(this, "Message", "Should your desktop be","Yes", "Cancel", 0, 1 ); |
50 | //if (answer) | ||
51 | // return; | ||
48 | QCopEnvelope e("QPE/System", "linkChanged(QString)"); | 52 | QCopEnvelope e("QPE/System", "linkChanged(QString)"); |
49 | //e << description << filename << mimetype; | ||
50 | QString link; //we'll just send an empty string | 53 | QString link; //we'll just send an empty string |
51 | e << link; | 54 | e << link; |
@@ -177,12 +180,10 @@ void TabManager::removeItem(){ | |||
177 | return; | 180 | return; |
178 | if(item->childCount() > 0){ | 181 | if(item->childCount() > 0){ |
179 | QMessageBox::critical(this, tr("Message"), tr("Can't remove with applications\nstill in the group."), | 182 | QMessageBox::critical(this, tr("Message"), tr("Can't remove with applications\nstill in the group."), tr("Ok") ); |
180 | tr("Ok") ); | ||
181 | return; | 183 | return; |
182 | } | 184 | } |
183 | 185 | ||
184 | // Prompt. | 186 | // Prompt. |
185 | int answer = QMessageBox::warning(this, tr("Message"), tr("Are you sure you want to delete?"), | 187 | int answer = QMessageBox::warning(this, tr("Message"), tr("Are you sure you want to delete?"), tr("Yes"), tr("Cancel"), 0, 1 ); |
186 | tr("Yes"), tr("Cancel"), 0, 1 ); | ||
187 | if (answer) | 188 | if (answer) |
188 | return; | 189 | return; |
@@ -203,5 +204,4 @@ void TabManager::removeItem(){ | |||
203 | else | 204 | else |
204 | removeSuccessfull = true; | 205 | removeSuccessfull = true; |
205 | |||
206 | } | 206 | } |
207 | 207 | ||
@@ -209,6 +209,5 @@ void TabManager::removeItem(){ | |||
209 | if(!removeSuccessfull){ | 209 | if(!removeSuccessfull){ |
210 | qDebug((QString("removeItem: ") + location).latin1()); | 210 | qDebug((QString("removeItem: ") + location).latin1()); |
211 | QMessageBox::critical(this, tr("Message"), tr("Can't remove."), | 211 | QMessageBox::critical(this, tr("Message"), tr("Can't remove."), tr("Ok") ); |
212 | tr("Ok") ); | ||
213 | return; | 212 | return; |
214 | } | 213 | } |
@@ -250,36 +249,89 @@ void TabManager::editItem( QListViewItem * item){ | |||
250 | } | 249 | } |
251 | 250 | ||
252 | AppEdit application(this, tr("Application edit"), true); | 251 | // Fill with all of the icons |
253 | application.nameLineEdit->setText(app.name()); | 252 | if(!application){ |
254 | application.iconLineEdit->setText(app.pixmapString()); | 253 | Wait waitDialog(this, "Wait dialog"); |
255 | application.execLineEdit->setText(app.exec()); | 254 | waitDialog.waitLabel->setText(tr("Gathering icons...")); |
256 | application.commentLineEdit->setText(app.comment()); | 255 | waitDialog.show(); |
256 | qApp->processEvents(); | ||
257 | application = new AppEdit(this, "Application edit", true); | ||
258 | |||
259 | QDir d(QPEApplication::qpeDir() + "/pics/"); | ||
260 | d.setFilter( QDir::Files); | ||
261 | |||
262 | const QFileInfoList *list = d.entryInfoList(); | ||
263 | QFileInfoListIterator it( *list ); // create list iterator | ||
264 | QFileInfo *fi; // pointer for traversing | ||
265 | |||
266 | while ( (fi=it.current()) ) { // for each file... | ||
267 | QString fileName = fi->fileName(); | ||
268 | if(fileName.right(4) == ".png"){ | ||
269 | fileName = fileName.mid(0,fileName.length()-4); | ||
270 | QPixmap imageOfFile(Resource::loadPixmap(fileName)); | ||
271 | QImage foo = imageOfFile.convertToImage(); | ||
272 | foo = foo.smoothScale(16,16); | ||
273 | imageOfFile.convertFromImage(foo); | ||
274 | application->iconLineEdit->insertItem(imageOfFile,fileName); | ||
275 | } | ||
276 | //qDebug(fi->fileName().latin1()); | ||
277 | ++it; | ||
278 | } | ||
279 | waitDialog.hide(); | ||
280 | } | ||
281 | int pixmap = -1; | ||
282 | QString pixmapText = app.pixmapString(); | ||
283 | QComboBox *f = application->iconLineEdit; | ||
284 | for(int i = 0; i < application->iconLineEdit->count(); i++){ | ||
285 | if(f->text(i) == pixmapText){ | ||
286 | pixmap = i; | ||
287 | break; | ||
288 | } | ||
289 | } | ||
290 | if(pixmap != -1) | ||
291 | application->iconLineEdit->setCurrentItem(pixmap); | ||
292 | else{ | ||
293 | QPixmap imageOfFile(Resource::loadPixmap(pixmapText)); | ||
294 | QImage foo = imageOfFile.convertToImage(); | ||
295 | foo = foo.smoothScale(16,16); | ||
296 | imageOfFile.convertFromImage(foo); | ||
297 | application->iconLineEdit->insertItem(imageOfFile,pixmapText,0); | ||
298 | application->iconLineEdit->setCurrentItem(0); | ||
299 | } | ||
300 | |||
301 | application->nameLineEdit->setText(app.name()); | ||
302 | application->execLineEdit->setText(app.exec()); | ||
303 | application->commentLineEdit->setText(app.comment()); | ||
257 | 304 | ||
258 | if(item->parent() == NULL){ | 305 | if(item->parent() == NULL){ |
259 | application.execLineEdit->setEnabled(false); | 306 | application->execLineEdit->setEnabled(false); |
260 | application.TextLabel3->setEnabled(false); | 307 | application->TextLabel3->setEnabled(false); |
261 | application.setCaption(tr("Tab")); | 308 | application->setCaption(tr("Tab")); |
309 | } | ||
310 | else{ | ||
311 | application->execLineEdit->setEnabled(true); | ||
312 | application->TextLabel3->setEnabled(true); | ||
313 | application->setCaption(tr("Application")); | ||
262 | } | 314 | } |
263 | 315 | ||
264 | // Only do somthing if they hit OK | 316 | // Only do somthing if they hit OK |
265 | if(application.exec() == 0) | 317 | application->showMaximized(); |
318 | if(application->exec() == 0) | ||
266 | return; | 319 | return; |
267 | 320 | ||
268 | // If nothing has changed exit (hmmm why did they hit ok?) | 321 | // If nothing has changed exit (hmmm why did they hit ok?) |
269 | if(app.name() == application.nameLineEdit->text() && | 322 | if(app.name() == application->nameLineEdit->text() && |
270 | app.pixmapString() == application.iconLineEdit->text() && | 323 | app.pixmapString() == application->iconLineEdit->currentText() && |
271 | app.comment() == application.commentLineEdit->text() && | 324 | app.comment() == application->commentLineEdit->text() && |
272 | app.exec() == application.execLineEdit->text()) | 325 | app.exec() == application->execLineEdit->text()) |
273 | return; | 326 | return; |
274 | 327 | ||
275 | // Change the applnk file | 328 | // Change the applnk file |
276 | QString oldName = app.name(); | 329 | QString oldName = app.name(); |
277 | app.setName(application.nameLineEdit->text()); | 330 | app.setName(application->nameLineEdit->text()); |
278 | app.setIcon(application.iconLineEdit->text()); | 331 | app.setIcon(application->iconLineEdit->currentText()); |
279 | app.setComment(application.commentLineEdit->text()); | 332 | app.setComment(application->commentLineEdit->text()); |
280 | app.setExec(application.execLineEdit->text()); | 333 | app.setExec(application->execLineEdit->text()); |
281 | if(!app.writeLink()){ | 334 | if(!app.writeLink()){ |
282 | QMessageBox::critical(this, tr("Message"), tr("Can't save."), | 335 | QMessageBox::critical(this, tr("Message"), "Can't save.", tr("Ok") ); |
283 | tr("Ok") ); | ||
284 | return; | 336 | return; |
285 | } | 337 | } |
@@ -345,6 +397,5 @@ void TabManager::moveApplication(QListViewItem *item, QListViewItem *newGroup){ | |||
345 | QDir r; | 397 | QDir r; |
346 | if(!r.rename(itemList[item], newFolder)){ | 398 | if(!r.rename(itemList[item], newFolder)){ |
347 | QMessageBox::critical(this, tr("Message"), tr("Can't move application."), | 399 | QMessageBox::critical(this, tr("Message"), "Can't move application.", tr("Ok") ); |
348 | tr("Ok") ); | ||
349 | return; | 400 | return; |
350 | } | 401 | } |
diff --git a/noncore/settings/tabmanager/tabmanager.h b/noncore/settings/tabmanager/tabmanager.h index 39865b0..7f8a65e 100644 --- a/noncore/settings/tabmanager/tabmanager.h +++ b/noncore/settings/tabmanager/tabmanager.h | |||
@@ -7,4 +7,5 @@ | |||
7 | 7 | ||
8 | class QListViewItem; | 8 | class QListViewItem; |
9 | class AppEdit; | ||
9 | 10 | ||
10 | class TabManager : public TabManagerBase { | 11 | class TabManager : public TabManagerBase { |
@@ -32,4 +33,7 @@ protected: | |||
32 | void swapInstalledLocation( QString installedAppFile, QString desktopFile, QString newLocation ); | 33 | void swapInstalledLocation( QString installedAppFile, QString desktopFile, QString newLocation ); |
33 | 34 | ||
35 | private: | ||
36 | AppEdit *application; | ||
37 | |||
34 | }; | 38 | }; |
35 | 39 | ||
diff --git a/noncore/settings/tabmanager/tabmanager.pro b/noncore/settings/tabmanager/tabmanager.pro index 999c8b4..5c65a1d 100644 --- a/noncore/settings/tabmanager/tabmanager.pro +++ b/noncore/settings/tabmanager/tabmanager.pro | |||
@@ -1,11 +1,10 @@ | |||
1 | TEMPLATE= app | 1 | TEMPLATE= app |
2 | #CONFIG = qt warn_on debug | ||
3 | CONFIG = qt warn_on release | 2 | CONFIG = qt warn_on release |
4 | HEADERS = tabmanager.h tabmainwindow.h app.h tablistview.h tabmanagerbase.h tabapplnk.h | 3 | HEADERS = tabmanager.h tabmainwindow.h tablistview.h tabmanagerbase.h tabapplnk.h |
5 | SOURCES = main.cpp tabmanager.cpp app.cpp tabmanagerbase.cpp | 4 | SOURCES = main.cpp tabmanager.cpp tabmanagerbase.cpp |
6 | INCLUDEPATH+= $(OPIEDIR)/include | 5 | INCLUDEPATH+= $(OPIEDIR)/include |
7 | DEPENDPATH+= $(OPIEDIR)/include | 6 | DEPENDPATH+= $(OPIEDIR)/include |
8 | LIBS += -lqpe | 7 | LIBS += -lqpe |
9 | #INTERFACES= tabmanagerbase.ui | 8 | INTERFACES= app.ui wait.ui |
10 | TARGET = tabmanager | 9 | TARGET = tabmanager |
11 | DESTDIR = $(OPIEDIR)/bin | 10 | DESTDIR = $(OPIEDIR)/bin |
diff --git a/noncore/settings/tabmanager/tabmanagerbase.cpp b/noncore/settings/tabmanager/tabmanagerbase.cpp index a899529..29ec3a5 100644 --- a/noncore/settings/tabmanager/tabmanagerbase.cpp +++ b/noncore/settings/tabmanager/tabmanagerbase.cpp | |||
@@ -27,12 +27,11 @@ TabManagerBase::TabManagerBase( QWidget* parent, const char* name, WFlags fl ) | |||
27 | setName( "TabManagerBase" ); | 27 | setName( "TabManagerBase" ); |
28 | resize( 289, 228 ); | 28 | resize( 289, 228 ); |
29 | setCaption( tr( "Tab Manger" ) ); | 29 | setCaption( tr( "Tab Manager" ) ); |
30 | TabManagerBaseLayout = new QVBoxLayout( this ); | 30 | TabManagerBaseLayout = new QVBoxLayout( this ); |
31 | TabManagerBaseLayout->setSpacing( 6 ); | 31 | TabManagerBaseLayout->setSpacing( 4 ); |
32 | TabManagerBaseLayout->setMargin( 0 ); | 32 | TabManagerBaseLayout->setMargin( 4 ); |
33 | 33 | ||
34 | tabList = new TabListView( this, "tabList" ); | 34 | tabList = new TabListView( this, "tabList" ); |
35 | tabList->addColumn( tr( "Groups" ) ); | 35 | tabList->addColumn( tr( "Hierarchy" ) ); |
36 | tabList->addColumn( tr( "Applications" ) ); | ||
37 | tabList->setRootIsDecorated( TRUE ); | 36 | tabList->setRootIsDecorated( TRUE ); |
38 | TabManagerBaseLayout->addWidget( tabList ); | 37 | TabManagerBaseLayout->addWidget( tabList ); |
diff --git a/noncore/settings/tabmanager/tabmanagerbase.ui b/noncore/settings/tabmanager/tabmanagerbase.ui index 2fd10dd..5ac0ff3 100644 --- a/noncore/settings/tabmanager/tabmanagerbase.ui +++ b/noncore/settings/tabmanager/tabmanagerbase.ui | |||
@@ -18,5 +18,5 @@ | |||
18 | <property stdset="1"> | 18 | <property stdset="1"> |
19 | <name>caption</name> | 19 | <name>caption</name> |
20 | <string>Tab Manger</string> | 20 | <string>Tab Manager</string> |
21 | </property> | 21 | </property> |
22 | <property> | 22 | <property> |
@@ -26,9 +26,9 @@ | |||
26 | <property stdset="1"> | 26 | <property stdset="1"> |
27 | <name>margin</name> | 27 | <name>margin</name> |
28 | <number>0</number> | 28 | <number>4</number> |
29 | </property> | 29 | </property> |
30 | <property stdset="1"> | 30 | <property stdset="1"> |
31 | <name>spacing</name> | 31 | <name>spacing</name> |
32 | <number>6</number> | 32 | <number>4</number> |
33 | </property> | 33 | </property> |
34 | <widget> | 34 | <widget> |
@@ -37,19 +37,5 @@ | |||
37 | <property> | 37 | <property> |
38 | <name>text</name> | 38 | <name>text</name> |
39 | <string>Groups</string> | 39 | <string>Hierarchy</string> |
40 | </property> | ||
41 | <property> | ||
42 | <name>clickable</name> | ||
43 | <bool>true</bool> | ||
44 | </property> | ||
45 | <property> | ||
46 | <name>resizeable</name> | ||
47 | <bool>true</bool> | ||
48 | </property> | ||
49 | </column> | ||
50 | <column> | ||
51 | <property> | ||
52 | <name>text</name> | ||
53 | <string>Applications</string> | ||
54 | </property> | 40 | </property> |
55 | <property> | 41 | <property> |