left align toolbar icons

1 files changed, 15 insertions, 12 deletions

diff --git a/noncore/apps/opie-gutenbrowser/gutenbrowserData.cpp b/noncore/apps/opie-gutenbrowser/gutenbrowserData.cpp
index d384c09..ae1f69c 100644
--- a/noncore/apps/opie-gutenbrowser/gutenbrowserData.cpp
+++ b/noncore/apps/opie-gutenbrowser/gutenbrowserData.cpp
@@ -167,4 +167,6 @@ qDebug("lease query before leaving the library.");;
 }// end initConfig()
 
+#define SCALED  Opie::Core::OResource::SmallIcon
+
 void Gutenbrowser::initMenuBar()
 {
@@ -174,10 +176,10 @@ void Gutenbrowser::initMenuBar()
 
     fileMenu=new QPopupMenu();
-    fileMenu->insertItem( Opie::Core::OResource::loadPixmap("gutenbrowser/openbook", Opie::Core::OResource::SmallIcon ),
+    fileMenu->insertItem( Opie::Core::OResource::loadPixmap("gutenbrowser/openbook", SCALED ),
                          "Open Local Library...", this, SLOT( OpenBtn()) );
 //    fileMenu->insertItem("Download FTPSite", this, SLOT( downloadFtpList()) );
-    fileMenu->insertItem( Opie::Core::OResource::loadPixmap("home", Opie::Core::OResource::SmallIcon ),
+    fileMenu->insertItem( Opie::Core::OResource::loadPixmap("home", SCALED ),
                           "Download Library Index", this, SLOT( downloadLibIndex()) );
-    fileMenu->insertItem( Opie::Core::OResource::loadPixmap("quit", Opie::Core::OResource::SmallIcon ),
+    fileMenu->insertItem( Opie::Core::OResource::loadPixmap("quit",SCALED),
                           "Quit Gutenbrowser...", this, SLOT( ByeBye()) );
       // menuBar entry editMenu
@@ -185,9 +187,9 @@ void Gutenbrowser::initMenuBar()
     editMenu=new QPopupMenu();
 
-    editMenu->insertItem( Opie::Core::OResource::loadPixmap("up", Opie::Core::OResource::SmallIcon ), "Top",
+    editMenu->insertItem( Opie::Core::OResource::loadPixmap("up", SCALED ), "Top",
                                                  this, SLOT(TopBtn()) );
-    editMenu->insertItem( Opie::Core::OResource::loadPixmap("back", Opie::Core::OResource::SmallIcon ), "Beginning",
+    editMenu->insertItem( Opie::Core::OResource::loadPixmap("back",SCALED ), "Beginning",
                           this, SLOT(doBeginBtn()) );
-    editMenu->insertItem( Opie::Core::OResource::loadPixmap("gutenbrowser/search", Opie::Core::OResource::SmallIcon ), "Search",
+    editMenu->insertItem( Opie::Core::OResource::loadPixmap("gutenbrowser/search",SCALED ), "Search",
                           this, SLOT(SearchBtn()) );
 
@@ -195,10 +197,10 @@ void Gutenbrowser::initMenuBar()
 
     optionsMenu= new QPopupMenu();
-    optionsMenu->insertItem( Opie::Core::OResource::loadPixmap("gutenbrowser/configure", Opie::Core::OResource::SmallIcon ),
+    optionsMenu->insertItem( Opie::Core::OResource::loadPixmap("gutenbrowser/configure",SCALED ),
                              "Configure", this, SLOT(doOptions()) );
 
     donateMenu = new QPopupMenu();
 //     donateMenu->insertItem("Gutenberg", this, SLOT(donateGutenberg()) );
-    donateMenu->insertItem( Opie::Core::OResource::loadPixmap("gutenbrowser/gutenbrowser_sm", Opie::Core::OResource::SmallIcon ),
+    donateMenu->insertItem( Opie::Core::OResource::loadPixmap("gutenbrowser/gutenbrowser_sm", SCALED ),
                             "Gutenbrowser Developer", this, SLOT(infoGutenbrowser()) );
 
@@ -215,5 +217,5 @@ void Gutenbrowser::initMenuBar()
 void Gutenbrowser::initButtonBar()
 {
-	qDebug("Starting buttonbar init.");
+//	qDebug("Starting buttonbar init.");
 
     OpenButton = new QPushButton( this, "OpenButton" );
@@ -250,6 +252,6 @@ void Gutenbrowser::initButtonBar()
 //    if(!useSplitter) {
 
-    buttonsHidden=FALSE;
-    buttons2->setSpacing(2);
+    buttonsHidden=false;
+
     buttons2->addWidget(OpenButton, 0, AlignCenter);
     buttons2->addWidget(LibraryButton, 0, AlignCenter);
@@ -261,6 +263,7 @@ void Gutenbrowser::initButtonBar()
     buttons2->addWidget(dictionaryButton, 0, AlignCenter);
     buttons2->addWidget(InfoBar, 0, AlignCenter);
+    buttons2->addStretch(5);
+    buttons2->setSpacing(5);
 
-    topLayout->setSpacing(0);
     topLayout->addLayout( buttons2,0);
 }