Преглед изворни кода

Remove uses of action groups, also change deprecated fileMenu->changeItem to fileNewMenu->actionMenu()->setIcon.
Fix preferred size setting.
Use QToolButton::setMenu and QToolButton::setPopupMode instead of QToolButton::setPopup and QToolButton::setPopupDelay.


git-svn-id: file:///var/svn/tigccpp/trunk@1009 9552661e-59e3-4036-b4f2-dbe53926924f

kevinkofler пре 17 година
родитељ
комит
b7ee68a3a4
4 измењених фајлова са 234 додато и 240 уклоњено
  1. 28 19
      ktigcc/mainform.cpp
  2. 197 212
      ktigcc/mainform.ui
  3. 3 3
      ktigcc/srcfilewin.cpp
  4. 6 6
      ktigcc/srcfilewin.ui

+ 28 - 19
ktigcc/mainform.cpp

@@ -1143,16 +1143,15 @@ void MainForm::init()
           this,SLOT(fileTreeAccel_activated(int)));
   kfinddialog = static_cast<KFindDialog *>(NULL);
   kreplace = static_cast<KReplaceWithSelection *>(NULL);
+  connect(fileNewAction,SIGNAL(triggered()),this,SLOT(fileNewProject()));
   if (preferences.useSystemIcons) {
     // Set the preferred icon size so system toolbar icons don't get annoying
     // padding.
     int toolbarIconSize=KIconLoader().currentSize(K3Icon::MainToolbar);
     setIconSize(QSize(toolbarIconSize,toolbarIconSize));
-// FIXME: action group icon
-//    fileNewActionGroup->setIcon(KIcon("filenew"));
-    fileMenu->changeItem(fileMenu->idAt(0),KIcon("filenew"),"&New");
+    fileNewAction->setIcon(KIcon("filenew"));
+    fileNewMenu->menuAction()->setIcon(KIcon("filenew"));
     fileOpenAction->setIcon(KIcon("fileopen"));
-//    fileOpenActionGroup->setIcon(KIcon("fileopen"));
     fileSaveAllAction->setIcon(KIcon("filesave"));
     filePrintAction->setIcon(KIcon("fileprint"));
     filePrintQuicklyAction->setIcon(KIcon("fileprint"));
@@ -1185,7 +1184,21 @@ void MainForm::init()
     debugPauseAction->setIcon(KIcon("player_pause"));
     toolsConfigureAction->setIcon(KIcon("configure"));
     debugResetAction->setIcon(KIcon("player_stop"));
-  }
+  } else fileNewMenu->menuAction()->setIcon(QIcon(QPixmap(":/images/00")));
+  QToolButton *fileNewButton=static_cast<QToolButton *>(toolBar
+    ->widgetForAction(fileNewAction));
+  fileNewButton->setPopupMode(QToolButton::MenuButtonPopup);
+  fileNewButton->setMenu(fileNewMenu);
+  QToolButton *fileOpenButton=static_cast<QToolButton *>(toolBar
+    ->widgetForAction(fileOpenAction));
+  QMenu *fileOpenMenu=new QMenu(this);
+  fileOpenMenu->setObjectName(QString::fromUtf8("fileOpenMenu"));
+  fileOpenMenu->addAction(fileRecent1Action);
+  fileOpenMenu->addAction(fileRecent2Action);
+  fileOpenMenu->addAction(fileRecent3Action);
+  fileOpenMenu->addAction(fileRecent4Action);
+  fileOpenButton->setPopupMode(QToolButton::MenuButtonPopup);
+  fileOpenButton->setMenu(fileOpenMenu);
   QToolButton *findFunctionsButton=static_cast<QToolButton *>(toolBar
     ->widgetForAction(findFunctionsAction));
   findFunctionsPopup=new Q3PopupMenu(findFunctionsButton);
@@ -1195,8 +1208,8 @@ void MainForm::init()
           this,SLOT(findFunctionsPopup_aboutToHide()));
   connect(findFunctionsPopup,SIGNAL(activated(int)),
           this,SLOT(findFunctionsPopup_activated(int)));
-  findFunctionsButton->setPopupDelay(0);
-  findFunctionsButton->setPopup(findFunctionsPopup);
+  findFunctionsButton->setPopupMode(QToolButton::MenuButtonPopup);
+  findFunctionsButton->setMenu(findFunctionsPopup);
   errorListDock=new QDockWidget("Errors and Warnings",this);
   errorListDock->setFloating(false);
   errorListDock->setFeatures(QDockWidget::DockWidgetClosable|QDockWidget::DockWidgetFloatable);
@@ -2601,11 +2614,9 @@ void MainForm::filePreferences()
       // padding.
       int toolbarIconSize=KIconLoader().currentSize(K3Icon::MainToolbar);
       setIconSize(QSize(toolbarIconSize,toolbarIconSize));
-// FIXME: action group icon
-//      fileNewActionGroup->setIcon(KIcon("filenew"));
-      fileMenu->changeItem(fileMenu->idAt(0),KIcon("filenew"),"&New");
+      fileNewAction->setIcon(KIcon("filenew"));
+      fileNewMenu->menuAction()->setIcon(KIcon("filenew"));
       fileOpenAction->setIcon(KIcon("fileopen"));
-//      fileOpenActionGroup->setIcon(KIcon("fileopen"));
       fileSaveAllAction->setIcon(KIcon("filesave"));
       filePrintAction->setIcon(KIcon("fileprint"));
       filePrintQuicklyAction->setIcon(KIcon("fileprint"));
@@ -2640,11 +2651,9 @@ void MainForm::filePreferences()
       debugResetAction->setIcon(KIcon("player_stop"));
     } else {
       setIconSize(QSize(20,20));
-// FIXME: action group icon
-//      fileNewActionGroup->setIcon(QIcon(QPixmap(":/images/00")));
-      fileMenu->changeItem(fileMenu->idAt(0),QIcon(QPixmap(":/images/00")),"&New");
+      fileNewAction->setIcon(QIcon(QPixmap(":/images/00")));
+      fileNewMenu->menuAction()->setIcon(QIcon(QPixmap(":/images/00")));
       fileOpenAction->setIcon(QIcon(QPixmap(":/images/01")));
-//      fileOpenActionGroup->setIcon(QIcon(QPixmap(":/images/01")));
       fileSaveAllAction->setIcon(QIcon(QPixmap(":/images/02")));
       filePrintAction->setIcon(QIcon(QPixmap(":/images/03")));
       filePrintQuicklyAction->setIcon(QIcon(QPixmap(":/images/03")));
@@ -3718,13 +3727,13 @@ void MainForm::startCompiling()
       sourceFile->fileSave();
     }
   }
-  fileNewActionGroup->setEnabled(FALSE);
+  fileNewMenu->menuAction()->setEnabled(FALSE);
+  fileNewAction->setEnabled(FALSE);
   fileOpenAction->setEnabled(FALSE);
   fileRecent1Action->setEnabled(FALSE);
   fileRecent2Action->setEnabled(FALSE);
   fileRecent3Action->setEnabled(FALSE);
   fileRecent4Action->setEnabled(FALSE);
-  fileOpenActionGroup->setEnabled(FALSE);
   fileExitAction->setEnabled(FALSE);
   projectAddFilesAction->setEnabled(FALSE);
   projectCompileAction->setVisible(FALSE);
@@ -3825,13 +3834,13 @@ void MainForm::stopCompiling()
   projectBuildAction->setVisible(TRUE);
   projectAddFilesAction->setEnabled(TRUE);
   fileExitAction->setEnabled(TRUE);
-  fileOpenActionGroup->setEnabled(TRUE);
   fileRecent1Action->setEnabled(TRUE);
   fileRecent2Action->setEnabled(TRUE);
   fileRecent3Action->setEnabled(TRUE);
   fileRecent4Action->setEnabled(TRUE);
   fileOpenAction->setEnabled(TRUE);
-  fileNewActionGroup->setEnabled(TRUE);
+  fileNewAction->setEnabled(TRUE);
+  fileNewMenu->menuAction()->setEnabled(TRUE);
   statusBar()->clear();
 }
 

+ 197 - 212
ktigcc/mainform.ui

@@ -12,6 +12,12 @@
   <property name="windowTitle" >
    <string>TIGCC IDE for KDE</string>
   </property>
+  <property name="iconSize" >
+   <size>
+    <width>20</width>
+    <height>20</height>
+   </size>
+  </property>
   <widget class="QWidget" name="widget" >
    <layout class="QHBoxLayout" >
     <property name="margin" >
@@ -65,30 +71,11 @@
    <property name="orientation" >
     <enum>Qt::Horizontal</enum>
    </property>
-   <property name="iconSize" >
-    <size>
-     <width>20</width>
-     <height>20</height>
-    </size>
-   </property>
    <attribute name="toolBarArea" >
     <number>4</number>
    </attribute>
-   <addaction name="fileNewProjectAction" />
-   <addaction name="fileNewFolderAction" />
-   <addaction name="fileNewCHeaderAction" />
-   <addaction name="fileNewGNUAssemblyHeaderAction" />
-   <addaction name="fileNewA68kAssemblyHeaderAction" />
-   <addaction name="fileNewCSourceFileAction" />
-   <addaction name="fileNewGNUAssemblySourceFileAction" />
-   <addaction name="fileNewA68kAssemblySourceFileAction" />
-   <addaction name="fileNewQuillSourceFileAction" />
-   <addaction name="fileNewTextFileAction" />
-   <addaction name="fileOpenActionHidden" />
-   <addaction name="fileRecent1Action" />
-   <addaction name="fileRecent2Action" />
-   <addaction name="fileRecent3Action" />
-   <addaction name="fileRecent4Action" />
+   <addaction name="fileNewAction" />
+   <addaction name="fileOpenAction" />
    <addaction name="fileSaveAllAction" />
    <addaction name="separator" />
    <addaction name="filePrintQuicklyAction" />
@@ -126,41 +113,6 @@
      <height>31</height>
     </rect>
    </property>
-   <widget class="QMenu" name="fileMenu" >
-    <property name="title" >
-     <string>&amp;File</string>
-    </property>
-    <widget class="QMenu" name="popupMenu" >
-     <property name="title" >
-      <string>&amp;New</string>
-     </property>
-     <addaction name="fileNewProjectAction" />
-     <addaction name="fileNewFolderAction" />
-     <addaction name="fileNewCHeaderAction" />
-     <addaction name="fileNewGNUAssemblyHeaderAction" />
-     <addaction name="fileNewA68kAssemblyHeaderAction" />
-     <addaction name="fileNewCSourceFileAction" />
-     <addaction name="fileNewGNUAssemblySourceFileAction" />
-     <addaction name="fileNewA68kAssemblySourceFileAction" />
-     <addaction name="fileNewQuillSourceFileAction" />
-     <addaction name="fileNewTextFileAction" />
-    </widget>
-    <addaction name="popupMenu" />
-    <addaction name="fileOpenAction" />
-    <addaction name="fileSaveAllAction" />
-    <addaction name="fileSaveProjectAsAction" />
-    <addaction name="separator" />
-    <addaction name="filePrintAction" />
-    <addaction name="separator" />
-    <addaction name="filePreferencesAction" />
-    <addaction name="separator" />
-    <addaction name="fileExitAction" />
-    <addaction name="separator" />
-    <addaction name="fileRecent1Action" />
-    <addaction name="fileRecent2Action" />
-    <addaction name="fileRecent3Action" />
-    <addaction name="fileRecent4Action" />
-   </widget>
    <widget class="QMenu" name="editMenu" >
     <property name="title" >
      <string>&amp;Edit</string>
@@ -234,6 +186,41 @@
     <addaction name="separator" />
     <addaction name="helpAboutAction" />
    </widget>
+   <widget class="QMenu" name="fileMenu" >
+    <property name="title" >
+     <string>&amp;File</string>
+    </property>
+    <widget class="QMenu" name="fileNewMenu" >
+     <property name="title" >
+      <string>&amp;New</string>
+     </property>
+     <addaction name="fileNewProjectAction" />
+     <addaction name="fileNewFolderAction" />
+     <addaction name="fileNewCHeaderAction" />
+     <addaction name="fileNewGNUAssemblyHeaderAction" />
+     <addaction name="fileNewA68kAssemblyHeaderAction" />
+     <addaction name="fileNewCSourceFileAction" />
+     <addaction name="fileNewGNUAssemblySourceFileAction" />
+     <addaction name="fileNewA68kAssemblySourceFileAction" />
+     <addaction name="fileNewQuillSourceFileAction" />
+     <addaction name="fileNewTextFileAction" />
+    </widget>
+    <addaction name="fileNewMenu" />
+    <addaction name="fileOpenAction" />
+    <addaction name="fileSaveAllAction" />
+    <addaction name="fileSaveProjectAsAction" />
+    <addaction name="separator" />
+    <addaction name="filePrintAction" />
+    <addaction name="separator" />
+    <addaction name="filePreferencesAction" />
+    <addaction name="separator" />
+    <addaction name="fileExitAction" />
+    <addaction name="separator" />
+    <addaction name="fileRecent1Action" />
+    <addaction name="fileRecent2Action" />
+    <addaction name="fileRecent3Action" />
+    <addaction name="fileRecent4Action" />
+   </widget>
    <addaction name="fileMenu" />
    <addaction name="editMenu" />
    <addaction name="findMenu" />
@@ -913,174 +900,172 @@
     <bool>false</bool>
    </property>
   </action>
-  <actiongroup name="fileNewActionGroup" >
-   <action name="fileNewProjectAction" >
-    <property name="text" >
-     <string>&amp;Project</string>
-    </property>
-    <property name="iconText" >
-     <string>&amp;Project</string>
-    </property>
-    <property name="statusTip" >
-     <string>Create a new project</string>
-    </property>
-    <property name="shortcut" >
-     <string>Ctrl+N</string>
-    </property>
-   </action>
-   <action name="fileNewFolderAction" >
-    <property name="enabled" >
-     <bool>true</bool>
-    </property>
-    <property name="text" >
-     <string>&amp;Folder</string>
-    </property>
-    <property name="iconText" >
-     <string>&amp;Folder</string>
-    </property>
-    <property name="statusTip" >
-     <string>Create a new virtual folder</string>
-    </property>
-   </action>
-   <action name="fileNewCHeaderAction" >
-    <property name="text" >
-     <string>C &amp;Header File</string>
-    </property>
-    <property name="iconText" >
-     <string>C &amp;Header File</string>
-    </property>
-    <property name="statusTip" >
-     <string>Create a new C header file in the current project</string>
-    </property>
-   </action>
-   <action name="fileNewGNUAssemblyHeaderAction" >
-    <property name="text" >
-     <string>G&amp;NU Assembly Header File</string>
-    </property>
-    <property name="iconText" >
-     <string>G&amp;NU Assembly Header File</string>
-    </property>
-    <property name="statusTip" >
-     <string>Create a new GNU assembly header file in the current project</string>
-    </property>
-   </action>
-   <action name="fileNewA68kAssemblyHeaderAction" >
-    <property name="text" >
-     <string>A68&amp;k Assembly &amp;Header File</string>
-    </property>
-    <property name="iconText" >
-     <string>A68&amp;k Assembly &amp;Header File</string>
-    </property>
-    <property name="statusTip" >
-     <string>Create a new A68k assembly header file in the current project</string>
-    </property>
-   </action>
-   <action name="fileNewCSourceFileAction" >
-    <property name="text" >
-     <string>&amp;C Source File</string>
-    </property>
-    <property name="iconText" >
-     <string>&amp;C Source File</string>
-    </property>
-    <property name="statusTip" >
-     <string>Create a new C source file in the current project</string>
-    </property>
-   </action>
-   <action name="fileNewGNUAssemblySourceFileAction" >
-    <property name="text" >
-     <string>&amp;GNU Assembly Source File</string>
-    </property>
-    <property name="iconText" >
-     <string>&amp;GNU Assembly Source File</string>
-    </property>
-    <property name="statusTip" >
-     <string>Create a new GNU assembly source file in the current project</string>
-    </property>
-   </action>
-   <action name="fileNewA68kAssemblySourceFileAction" >
-    <property name="text" >
-     <string>&amp;A68k Assembly Source File</string>
-    </property>
-    <property name="iconText" >
-     <string>&amp;A68k Assembly Source File</string>
-    </property>
-    <property name="statusTip" >
-     <string>Create a new A68k assembly source file in the current project</string>
-    </property>
-   </action>
-   <action name="fileNewQuillSourceFileAction" >
-    <property name="text" >
-     <string>&amp;Quill Source File</string>
-    </property>
-    <property name="iconText" >
-     <string>&amp;Quill Source File</string>
-    </property>
-    <property name="statusTip" >
-     <string>Create a new Quill source file in the current project</string>
-    </property>
-   </action>
-   <action name="fileNewTextFileAction" >
-    <property name="text" >
-     <string>&amp;Text File</string>
-    </property>
-    <property name="iconText" >
-     <string>&amp;Text File</string>
-    </property>
-    <property name="statusTip" >
-     <string>Create a new text file in the current project, for general use</string>
-    </property>
-   </action>
-   <property name="exclusive" >
-    <bool>false</bool>
+  <action name="fileNewProjectAction" >
+   <property name="text" >
+    <string>&amp;Project</string>
    </property>
-  </actiongroup>
-  <actiongroup name="fileOpenActionGroup" >
-   <action name="fileOpenActionHidden" >
-    <property name="iconText" >
-     <string>Open File</string>
-    </property>
-    <property name="visible" >
-     <bool>false</bool>
-    </property>
-   </action>
-   <action name="fileRecent1Action" >
-    <property name="iconText" >
-     <string>Recent File 1</string>
-    </property>
-   </action>
-   <action name="fileRecent2Action" >
-    <property name="iconText" >
-     <string>Recent File 2</string>
-    </property>
-   </action>
-   <action name="fileRecent3Action" >
-    <property name="iconText" >
-     <string>Recent File 3</string>
-    </property>
-   </action>
-   <action name="fileRecent4Action" >
-    <property name="iconText" >
-     <string>Recent File 4</string>
-    </property>
-   </action>
-   <property name="exclusive" >
+   <property name="iconText" >
+    <string>&amp;Project</string>
+   </property>
+   <property name="statusTip" >
+    <string>Create a new project</string>
+   </property>
+   <property name="shortcut" >
+    <string>Ctrl+N</string>
+   </property>
+  </action>
+  <action name="fileNewFolderAction" >
+   <property name="enabled" >
+    <bool>true</bool>
+   </property>
+   <property name="text" >
+    <string>&amp;Folder</string>
+   </property>
+   <property name="iconText" >
+    <string>&amp;Folder</string>
+   </property>
+   <property name="statusTip" >
+    <string>Create a new virtual folder</string>
+   </property>
+  </action>
+  <action name="fileNewCHeaderAction" >
+   <property name="text" >
+    <string>C &amp;Header File</string>
+   </property>
+   <property name="iconText" >
+    <string>C &amp;Header File</string>
+   </property>
+   <property name="statusTip" >
+    <string>Create a new C header file in the current project</string>
+   </property>
+  </action>
+  <action name="fileNewGNUAssemblyHeaderAction" >
+   <property name="text" >
+    <string>G&amp;NU Assembly Header File</string>
+   </property>
+   <property name="iconText" >
+    <string>G&amp;NU Assembly Header File</string>
+   </property>
+   <property name="statusTip" >
+    <string>Create a new GNU assembly header file in the current project</string>
+   </property>
+  </action>
+  <action name="fileNewA68kAssemblyHeaderAction" >
+   <property name="text" >
+    <string>A68&amp;k Assembly &amp;Header File</string>
+   </property>
+   <property name="iconText" >
+    <string>A68&amp;k Assembly &amp;Header File</string>
+   </property>
+   <property name="statusTip" >
+    <string>Create a new A68k assembly header file in the current project</string>
+   </property>
+  </action>
+  <action name="fileNewCSourceFileAction" >
+   <property name="text" >
+    <string>&amp;C Source File</string>
+   </property>
+   <property name="iconText" >
+    <string>&amp;C Source File</string>
+   </property>
+   <property name="statusTip" >
+    <string>Create a new C source file in the current project</string>
+   </property>
+  </action>
+  <action name="fileNewGNUAssemblySourceFileAction" >
+   <property name="text" >
+    <string>&amp;GNU Assembly Source File</string>
+   </property>
+   <property name="iconText" >
+    <string>&amp;GNU Assembly Source File</string>
+   </property>
+   <property name="statusTip" >
+    <string>Create a new GNU assembly source file in the current project</string>
+   </property>
+  </action>
+  <action name="fileNewA68kAssemblySourceFileAction" >
+   <property name="text" >
+    <string>&amp;A68k Assembly Source File</string>
+   </property>
+   <property name="iconText" >
+    <string>&amp;A68k Assembly Source File</string>
+   </property>
+   <property name="statusTip" >
+    <string>Create a new A68k assembly source file in the current project</string>
+   </property>
+  </action>
+  <action name="fileNewQuillSourceFileAction" >
+   <property name="text" >
+    <string>&amp;Quill Source File</string>
+   </property>
+   <property name="iconText" >
+    <string>&amp;Quill Source File</string>
+   </property>
+   <property name="statusTip" >
+    <string>Create a new Quill source file in the current project</string>
+   </property>
+  </action>
+  <action name="fileNewTextFileAction" >
+   <property name="text" >
+    <string>&amp;Text File</string>
+   </property>
+   <property name="iconText" >
+    <string>&amp;Text File</string>
+   </property>
+   <property name="statusTip" >
+    <string>Create a new text file in the current project, for general use</string>
+   </property>
+  </action>
+  <action name="fileOpenActionHidden" >
+   <property name="iconText" >
+    <string>Open File</string>
+   </property>
+   <property name="visible" >
     <bool>false</bool>
    </property>
-  </actiongroup>
+  </action>
+  <action name="fileRecent1Action" >
+   <property name="iconText" >
+    <string>Recent File 1</string>
+   </property>
+  </action>
+  <action name="fileRecent2Action" >
+   <property name="iconText" >
+    <string>Recent File 2</string>
+   </property>
+  </action>
+  <action name="fileRecent3Action" >
+   <property name="iconText" >
+    <string>Recent File 3</string>
+   </property>
+  </action>
+  <action name="fileRecent4Action" >
+   <property name="iconText" >
+    <string>Recent File 4</string>
+   </property>
+  </action>
+  <action name="fileNewAction" >
+   <property name="icon" >
+    <iconset resource="icons.qrc" >:/images/00</iconset>
+   </property>
+   <property name="text" >
+    <string>New File</string>
+   </property>
+  </action>
  </widget>
  <layoutdefault spacing="0" margin="0" />
  <customwidgets>
-  <customwidget>
-   <class>K3ListView</class>
-   <extends>Q3ListView</extends>
-   <header>k3listview.h</header>
-  </customwidget>
   <customwidget>
    <class>Q3WidgetStack</class>
    <extends>Q3WidgetStack</extends>
    <header>q3widgetstack.h</header>
    <container>1</container>
   </customwidget>
+  <customwidget>
+   <class>K3ListView</class>
+   <extends>Q3ListView</extends>
+   <header>k3listview.h</header>
+  </customwidget>
  </customwidgets>
  <includes>
   <include location="local" >k3listview.h</include>

+ 3 - 3
ktigcc/srcfilewin.cpp

@@ -274,7 +274,7 @@ void SourceFileWindow::initBase()
     editDecreaseIndentAction->setIcon(KIcon("unindent"));
   }
   QToolButton *findFunctionsButton=static_cast<QToolButton *>(toolBar
-    ->child("findFunctionsAction_action_button","QToolButton",FALSE));
+    ->widgetForAction(findFunctionsAction));
   THIS->findFunctionsPopup=new Q3PopupMenu(findFunctionsButton);
   connect(THIS->findFunctionsPopup,SIGNAL(aboutToShow()),
           this,SLOT(findFunctionsPopup_aboutToShow()));
@@ -282,8 +282,8 @@ void SourceFileWindow::initBase()
           this,SLOT(findFunctionsPopup_aboutToHide()));
   connect(THIS->findFunctionsPopup,SIGNAL(activated(int)),
           this,SLOT(findFunctionsPopup_activated(int)));
-  findFunctionsButton->setPopupDelay(0);
-  findFunctionsButton->setPopup(THIS->findFunctionsPopup);
+  findFunctionsButton->setPopupMode(QToolButton::MenuButtonPopup);
+  findFunctionsButton->setMenu(THIS->findFunctionsPopup);
   if (THIS->isTextFile) findFunctionsAction->setEnabled(FALSE);
 }
 

+ 6 - 6
ktigcc/srcfilewin.ui

@@ -12,6 +12,12 @@
   <property name="windowTitle" >
    <string>TIGCC IDE for KDE</string>
   </property>
+  <property name="iconSize" >
+   <size>
+    <width>20</width>
+    <height>20</height>
+   </size>
+  </property>
   <widget class="QWidget" name="widget" >
    <layout class="QVBoxLayout" >
     <property name="margin" >
@@ -29,12 +35,6 @@
    <property name="orientation" >
     <enum>Qt::Horizontal</enum>
    </property>
-   <property name="iconSize" >
-    <size>
-     <width>20</width>
-     <height>20</height>
-    </size>
-   </property>
    <attribute name="toolBarArea" >
     <number>4</number>
    </attribute>