author | leseb <leseb> | 2002-07-08 14:58:34 (UTC) |
---|---|---|
committer | leseb <leseb> | 2002-07-08 14:58:34 (UTC) |
commit | 8b6a15ef84bc6b1c9c1a82689788c6e281780495 (patch) (side-by-side diff) | |
tree | 1d2c2f416aab46103d244a0b9d5b1c764c9f5452 /noncore/settings/tabmanager | |
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 @@ -/**************************************************************************** -** Form implementation generated from reading ui file 'app.ui' -** -** Created: Fri May 3 14:38:15 2002 -** by: The User Interface Compiler (uic) -** -** WARNING! All changes made in this file will be lost! -****************************************************************************/ -#include "app.h" - -#include <qlabel.h> -#include <qlineedit.h> -#include <qpushbutton.h> -#include <qlayout.h> -#include <qvariant.h> -#include <qtooltip.h> -#include <qwhatsthis.h> - -/* - * Constructs a AppEdit which is a child of 'parent', with the - * name 'name' and widget flags set to 'f' - * - * The dialog will by default be modeless, unless you set 'modal' to - * TRUE to construct a modal dialog. - */ -AppEdit::AppEdit( QWidget* parent, const char* name, bool modal, WFlags fl ) - : QDialog( parent, name, modal, fl ) -{ - if ( !name ) - setName( "AppEdit" ); - resize( 211, 241 ); - setCaption( tr( "Application" ) ); - AppEditLayout = new QGridLayout( this ); - AppEditLayout->setSpacing( 6 ); - AppEditLayout->setMargin( 11 ); - - TextLabel3 = new QLabel( this, "TextLabel3" ); - TextLabel3->setText( tr( "Exec" ) ); - - AppEditLayout->addWidget( TextLabel3, 2, 0 ); - - TextLabel4 = new QLabel( this, "TextLabel4" ); - TextLabel4->setText( tr( "Comment" ) ); - - AppEditLayout->addWidget( TextLabel4, 3, 0 ); - - TextLabel2 = new QLabel( this, "TextLabel2" ); - TextLabel2->setText( tr( "Icon" ) ); - - AppEditLayout->addWidget( TextLabel2, 1, 0 ); - - TextLabel1 = new QLabel( this, "TextLabel1" ); - TextLabel1->setText( tr( "Name" ) ); - - AppEditLayout->addWidget( TextLabel1, 0, 0 ); - - iconLineEdit = new QLineEdit( this, "iconLineEdit" ); - - AppEditLayout->addWidget( iconLineEdit, 1, 1 ); - - nameLineEdit = new QLineEdit( this, "nameLineEdit" ); - - AppEditLayout->addWidget( nameLineEdit, 0, 1 ); - - commentLineEdit = new QLineEdit( this, "commentLineEdit" ); - - AppEditLayout->addWidget( commentLineEdit, 3, 1 ); - - execLineEdit = new QLineEdit( this, "execLineEdit" ); - - AppEditLayout->addWidget( execLineEdit, 2, 1 ); - QSpacerItem* spacer = new QSpacerItem( 20, 20, QSizePolicy::Minimum, QSizePolicy::Expanding ); - AppEditLayout->addItem( spacer, 4, 1 ); -} - -/* - * Destroys the object and frees any allocated resources - */ -AppEdit::~AppEdit() -{ - // no need to delete child widgets, Qt does it all for us -} - 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 @@ -/**************************************************************************** -** Form interface generated from reading ui file 'app.ui' -** -** Created: Fri May 3 14:38:09 2002 -** by: The User Interface Compiler (uic) -** -** WARNING! All changes made in this file will be lost! -****************************************************************************/ -#ifndef APPEDIT_H -#define APPEDIT_H - -#include <qvariant.h> -#include <qdialog.h> -class QVBoxLayout; -class QHBoxLayout; -class QGridLayout; -class QLabel; -class QLineEdit; - -class AppEdit : public QDialog -{ - Q_OBJECT - -public: - AppEdit( QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); - ~AppEdit(); - - QLabel* TextLabel3; - QLabel* TextLabel4; - QLabel* TextLabel2; - QLabel* TextLabel1; - QLineEdit* iconLineEdit; - QLineEdit* nameLineEdit; - QLineEdit* commentLineEdit; - QLineEdit* execLineEdit; - -protected: - QGridLayout* AppEditLayout; -}; - -#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 @@ -3,7 +3,9 @@ Files: bin/tabmanager apps/Settings/tabmanager.desktop pics/tabmanager/tabmanage Priority: optional -Version: 1.0 +Section: opie/settings +Version: $QPE_VERSION-$SUB_VERSION-1.0 +Depends: opie-base ($QPE_VERSION) Architecture: arm Maintainer: Benjamin Meyer <meyerb@sharpsec.com> -Section: Settings Description: Tab Manager - Helps to manage the Applications tab + Create new tabs, remove old tabs. Edit tab's name, comment and icon. + 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 @@ -15,4 +15,7 @@ public: setCaption("Tab Manager"); + setToolBarsMovable(false); this->setCentralWidget(tabManager); QToolBar *newToolBar = new QToolBar("toolbar", this); + QToolBar *emptyToolBar = new QToolBar("empty", this); + emptyToolBar->setHorizontalStretchable(true); @@ -20,5 +23,5 @@ public: QToolButton *newFolder = new QToolButton(Resource::loadPixmap("fileopen"), "New Folder", 0, tabManager, SLOT(newFolder()), newToolBar); - QToolButton *newFile = new QToolButton(Resource::loadPixmap("new"), "New Folder", 0, tabManager, SLOT(newApplication()), newToolBar); + QToolButton *newFile = new QToolButton(Resource::loadPixmap("new"), "New Application", 0, tabManager, SLOT(newApplication()), newToolBar); QToolButton *editItem = new QToolButton(Resource::loadPixmap("edit"), "Edit", 0, tabManager, SLOT(editCurrentItem()), newToolBar); - QToolButton *deleteItem = new QToolButton(Resource::loadPixmap("reset"), "Deelete", 0, tabManager, SLOT(removeItem()), newToolBar); + QToolButton *deleteItem = new QToolButton(Resource::loadPixmap("trash"), "Delete", 0, tabManager, SLOT(removeItem()), newToolBar); 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 @@ -2,2 +2,3 @@ #include "app.h" +#include "wait.h" #include "tabapplnk.h" @@ -5,3 +6,2 @@ #include <qpe/applnk.h> -#include <qpe/qpeapplication.h> #include <qdir.h> @@ -11,2 +11,3 @@ #include <qheader.h> +#include <qcombobox.h> #include <qlineedit.h> @@ -16,4 +17,7 @@ #include <qpe/qcopenvelope_qws.h> +#include <qpe/qpeapplication.h> +#include <qpe/resource.h> + -#define HOME_APP_DIR QPEApplication::qpeDir()+"/apps" // <-- made this a little more flexible +#define HOME_APP_DIR QPEApplication::qpeDir()+"/apps" #define HOME_APP_INSTALL_DIR "/usr/lib/ipkg/info" @@ -28,3 +32,3 @@ */ -TabManager::TabManager( QWidget* parent, const char* name):TabManagerBase(parent, name), changed(false){ +TabManager::TabManager( QWidget* parent, const char* name):TabManagerBase(parent, name), changed(false), application(NULL){ rescanFolder(HOME_APP_DIR); @@ -32,7 +36,5 @@ TabManager::TabManager( QWidget* parent, const char* name):TabManagerBase(parent // Connect the signals and slots - connect(tabList, SIGNAL(doubleClicked(QListViewItem *)), - this, SLOT(editItem(QListViewItem*))); + connect(tabList, SIGNAL(doubleClicked(QListViewItem *)), this, SLOT(editItem(QListViewItem*))); (tabList->header())->hide(); - connect(tabList, SIGNAL(moveItem(QListViewItem *, QListViewItem *)), - this, SLOT(moveApplication(QListViewItem *, QListViewItem *))); + connect(tabList, SIGNAL(moveItem(QListViewItem *, QListViewItem *)), this, SLOT(moveApplication(QListViewItem *, QListViewItem *))); } @@ -45,6 +47,7 @@ TabManager::~TabManager(){ if(changed){ - //QMessageBox::critical(this, tr("Message"), tr("Please restart Qtopia to see all new changes."),tr("Ok") ); - //filename = fn; + // Prompt. + //int answer = QMessageBox::warning(this, "Message", "Should your desktop be","Yes", "Cancel", 0, 1 ); + //if (answer) + // return; QCopEnvelope e("QPE/System", "linkChanged(QString)"); - //e << description << filename << mimetype; QString link; //we'll just send an empty string @@ -178,4 +181,3 @@ void TabManager::removeItem(){ if(item->childCount() > 0){ - QMessageBox::critical(this, tr("Message"), tr("Can't remove with applications\nstill in the group."), - tr("Ok") ); + QMessageBox::critical(this, tr("Message"), tr("Can't remove with applications\nstill in the group."), tr("Ok") ); return; @@ -184,4 +186,3 @@ void TabManager::removeItem(){ // Prompt. - int answer = QMessageBox::warning(this, tr("Message"), tr("Are you sure you want to delete?"), - tr("Yes"), tr("Cancel"), 0, 1 ); + int answer = QMessageBox::warning(this, tr("Message"), tr("Are you sure you want to delete?"), tr("Yes"), tr("Cancel"), 0, 1 ); if (answer) @@ -204,3 +205,2 @@ void TabManager::removeItem(){ removeSuccessfull = true; - } @@ -210,4 +210,3 @@ void TabManager::removeItem(){ qDebug((QString("removeItem: ") + location).latin1()); - QMessageBox::critical(this, tr("Message"), tr("Can't remove."), - tr("Ok") ); + QMessageBox::critical(this, tr("Message"), tr("Can't remove."), tr("Ok") ); return; @@ -251,12 +250,65 @@ void TabManager::editItem( QListViewItem * item){ - AppEdit application(this, tr("Application edit"), true); - application.nameLineEdit->setText(app.name()); - application.iconLineEdit->setText(app.pixmapString()); - application.execLineEdit->setText(app.exec()); - application.commentLineEdit->setText(app.comment()); + // Fill with all of the icons + if(!application){ + Wait waitDialog(this, "Wait dialog"); + waitDialog.waitLabel->setText(tr("Gathering icons...")); + waitDialog.show(); + qApp->processEvents(); + application = new AppEdit(this, "Application edit", true); + + QDir d(QPEApplication::qpeDir() + "/pics/"); + d.setFilter( QDir::Files); + + const QFileInfoList *list = d.entryInfoList(); + QFileInfoListIterator it( *list ); // create list iterator + QFileInfo *fi; // pointer for traversing + + while ( (fi=it.current()) ) { // for each file... + QString fileName = fi->fileName(); + if(fileName.right(4) == ".png"){ + fileName = fileName.mid(0,fileName.length()-4); + QPixmap imageOfFile(Resource::loadPixmap(fileName)); + QImage foo = imageOfFile.convertToImage(); + foo = foo.smoothScale(16,16); + imageOfFile.convertFromImage(foo); + application->iconLineEdit->insertItem(imageOfFile,fileName); + } + //qDebug(fi->fileName().latin1()); + ++it; + } + waitDialog.hide(); + } + int pixmap = -1; + QString pixmapText = app.pixmapString(); + QComboBox *f = application->iconLineEdit; + for(int i = 0; i < application->iconLineEdit->count(); i++){ + if(f->text(i) == pixmapText){ + pixmap = i; + break; + } + } + if(pixmap != -1) + application->iconLineEdit->setCurrentItem(pixmap); + else{ + QPixmap imageOfFile(Resource::loadPixmap(pixmapText)); + QImage foo = imageOfFile.convertToImage(); + foo = foo.smoothScale(16,16); + imageOfFile.convertFromImage(foo); + application->iconLineEdit->insertItem(imageOfFile,pixmapText,0); + application->iconLineEdit->setCurrentItem(0); + } + + application->nameLineEdit->setText(app.name()); + application->execLineEdit->setText(app.exec()); + application->commentLineEdit->setText(app.comment()); if(item->parent() == NULL){ - application.execLineEdit->setEnabled(false); - application.TextLabel3->setEnabled(false); - application.setCaption(tr("Tab")); + application->execLineEdit->setEnabled(false); + application->TextLabel3->setEnabled(false); + application->setCaption(tr("Tab")); + } + else{ + application->execLineEdit->setEnabled(true); + application->TextLabel3->setEnabled(true); + application->setCaption(tr("Application")); } @@ -264,3 +316,4 @@ void TabManager::editItem( QListViewItem * item){ // Only do somthing if they hit OK - if(application.exec() == 0) + application->showMaximized(); + if(application->exec() == 0) return; @@ -268,6 +321,6 @@ void TabManager::editItem( QListViewItem * item){ // If nothing has changed exit (hmmm why did they hit ok?) - if(app.name() == application.nameLineEdit->text() && - app.pixmapString() == application.iconLineEdit->text() && - app.comment() == application.commentLineEdit->text() && - app.exec() == application.execLineEdit->text()) + if(app.name() == application->nameLineEdit->text() && + app.pixmapString() == application->iconLineEdit->currentText() && + app.comment() == application->commentLineEdit->text() && + app.exec() == application->execLineEdit->text()) return; @@ -276,9 +329,8 @@ void TabManager::editItem( QListViewItem * item){ QString oldName = app.name(); - app.setName(application.nameLineEdit->text()); - app.setIcon(application.iconLineEdit->text()); - app.setComment(application.commentLineEdit->text()); - app.setExec(application.execLineEdit->text()); + app.setName(application->nameLineEdit->text()); + app.setIcon(application->iconLineEdit->currentText()); + app.setComment(application->commentLineEdit->text()); + app.setExec(application->execLineEdit->text()); if(!app.writeLink()){ - QMessageBox::critical(this, tr("Message"), tr("Can't save."), - tr("Ok") ); + QMessageBox::critical(this, tr("Message"), "Can't save.", tr("Ok") ); return; @@ -346,4 +398,3 @@ void TabManager::moveApplication(QListViewItem *item, QListViewItem *newGroup){ if(!r.rename(itemList[item], newFolder)){ - QMessageBox::critical(this, tr("Message"), tr("Can't move application."), - tr("Ok") ); + QMessageBox::critical(this, tr("Message"), "Can't move application.", tr("Ok") ); return; 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 @@ -8,2 +8,3 @@ class QListViewItem; +class AppEdit; @@ -33,2 +34,5 @@ protected: +private: + AppEdit *application; + }; 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,6 +1,5 @@ TEMPLATE = app -#CONFIG = qt warn_on debug CONFIG = qt warn_on release -HEADERS = tabmanager.h tabmainwindow.h app.h tablistview.h tabmanagerbase.h tabapplnk.h -SOURCES = main.cpp tabmanager.cpp app.cpp tabmanagerbase.cpp +HEADERS = tabmanager.h tabmainwindow.h tablistview.h tabmanagerbase.h tabapplnk.h +SOURCES = main.cpp tabmanager.cpp tabmanagerbase.cpp INCLUDEPATH += $(OPIEDIR)/include @@ -8,3 +7,3 @@ DEPENDPATH += $(OPIEDIR)/include LIBS += -lqpe -#INTERFACES = tabmanagerbase.ui +INTERFACES = app.ui wait.ui TARGET = tabmanager 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 @@ -28,10 +28,9 @@ TabManagerBase::TabManagerBase( QWidget* parent, const char* name, WFlags fl ) resize( 289, 228 ); - setCaption( tr( "Tab Manger" ) ); + setCaption( tr( "Tab Manager" ) ); TabManagerBaseLayout = new QVBoxLayout( this ); - TabManagerBaseLayout->setSpacing( 6 ); - TabManagerBaseLayout->setMargin( 0 ); + TabManagerBaseLayout->setSpacing( 4 ); + TabManagerBaseLayout->setMargin( 4 ); tabList = new TabListView( this, "tabList" ); - tabList->addColumn( tr( "Groups" ) ); - tabList->addColumn( tr( "Applications" ) ); + tabList->addColumn( tr( "Hierarchy" ) ); tabList->setRootIsDecorated( TRUE ); 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 @@ -19,3 +19,3 @@ <name>caption</name> - <string>Tab Manger</string> + <string>Tab Manager</string> </property> @@ -27,3 +27,3 @@ <name>margin</name> - <number>0</number> + <number>4</number> </property> @@ -31,3 +31,3 @@ <name>spacing</name> - <number>6</number> + <number>4</number> </property> @@ -38,17 +38,3 @@ <name>text</name> - <string>Groups</string> - </property> - <property> - <name>clickable</name> - <bool>true</bool> - </property> - <property> - <name>resizeable</name> - <bool>true</bool> - </property> - </column> - <column> - <property> - <name>text</name> - <string>Applications</string> + <string>Hierarchy</string> </property> |