aw/valentina
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed issue #222. Move Layout icon on top toolbar so it is next to Detail mode.

Browse Source 
--HG--
branch : develop
This commit is contained in:
dismine 2015-01-26 17:13:46 +02:00
parent aac096d897
commit 9875558e49
2 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/app/mainwindow.cpp
View File

@ -942,7 +942,6 @@ void MainWindow::ToolBarDraws()
ui->actionHistory->setEnabled(false); ui->actionHistory->setEnabled(false);
connect(ui->actionHistory, &QAction::triggered, this, &MainWindow::ActionHistory); connect(ui->actionHistory, &QAction::triggered, this, &MainWindow::ActionHistory);
ui->toolBarDraws->addAction(ui->actionLayout);
connect(ui->actionLayout, &QAction::triggered, this, &MainWindow::ActionLayout); connect(ui->actionLayout, &QAction::triggered, this, &MainWindow::ActionLayout);
ui->actionLayout->setEnabled(false); ui->actionLayout->setEnabled(false);
} }

23
src/app/mainwindow.ui
View File

@ -832,7 +832,7 @@
<addaction name="actionSave"/> <addaction name="actionSave"/>
</widget> </widget>
<widget class="QStatusBar" name="statusBar"/> <widget class="QStatusBar" name="statusBar"/>
<widget class="QToolBar" name="toolBar"> <widget class="QToolBar" name="toolBarStages">
<property name="enabled"> <property name="enabled">
<bool>true</bool> <bool>true</bool>
</property> </property>
@ -847,7 +847,7 @@
</attribute> </attribute>
<addaction name="actionDraw"/> <addaction name="actionDraw"/>
<addaction name="actionDetails"/> <addaction name="actionDetails"/>
<addaction name="actionArrowTool"/> <addaction name="actionLayout"/>
</widget> </widget>
<widget class="QToolBar" name="toolBarDraws"> <widget class="QToolBar" name="toolBarDraws">
<property name="windowTitle"> <property name="windowTitle">
@ -906,6 +906,18 @@
</attribute> </attribute>
<widget class="QWidget" name="dockWidgetContents_10"/> <widget class="QWidget" name="dockWidgetContents_10"/>
</widget> </widget>
<widget class="QToolBar" name="toolBarArrows">
<property name="windowTitle">
<string>toolBar</string>
</property>
<attribute name="toolBarArea">
<enum>TopToolBarArea</enum>
</attribute>
<attribute name="toolBarBreak">
<bool>false</bool>
</attribute>
<addaction name="actionArrowTool"/>
</widget>
<action name="actionNew"> <action name="actionNew">
<property name="icon"> <property name="icon">
<iconset theme="document-new"> <iconset theme="document-new">
@ -1106,6 +1118,9 @@
</property> </property>
</action> </action>
<action name="actionLayout"> <action name="actionLayout">
<property name="enabled">
<bool>false</bool>
</property>
<property name="icon"> <property name="icon">
<iconset resource="share/resources/icon.qrc"> <iconset resource="share/resources/icon.qrc">
<normaloff>:/icon/32x32/layout.png</normaloff>:/icon/32x32/layout.png</iconset> <normaloff>:/icon/32x32/layout.png</normaloff>:/icon/32x32/layout.png</iconset>
@ -1264,7 +1279,9 @@
</action> </action>
<action name="actionOnlineHelp"> <action name="actionOnlineHelp">
<property name="icon"> <property name="icon">
<iconset theme="help-contents"/> <iconset theme="help-contents">
<normaloff/>
</iconset>
</property> </property>
<property name="text"> <property name="text">
<string>Online help</string> <string>Online help</string>