Sync with 1.2 version + some bug fixes

1 files changed, 10 insertions, 7 deletions

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
@@ -7,21 +7,24 @@
 #include <qtoolbutton.h>
 #include <qpe/resource.h>
 
-class TabMainWindow : public QMainWindow {
+class TabMainWindow : public QMainWindow { 
 
 public:
   TabMainWindow( QWidget* parent = 0, const char* name = 0) : QMainWindow(parent, name){
     tabManager = new TabManager(this, "TabManger");
     setCaption("Tab Manager");
+    setToolBarsMovable(false);
     this->setCentralWidget(tabManager);
     QToolBar *newToolBar = new QToolBar("toolbar", this);
-
-    // Insert all of the buttons.
+    QToolBar *emptyToolBar = new QToolBar("empty", this);
+    emptyToolBar->setHorizontalStretchable(true);
+   
+    // Insert all of the buttons. 
     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);
+    
   };
 
 protected:
@@ -31,5 +34,5 @@ protected:
 
 #endif
 
-// tabmainwindow.h
+// tabmainwindow.h