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

Merge

Browse Source 
--HG--
branch : develop
This commit is contained in:
Roman Telezhynskyi 2016-01-10 17:03:12 +02:00
commit 50dbe9471f
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
share/measurement-body-diagram.svg
View File

@ -13550,7 +13550,7 @@
y="2496.2417" y="2496.2417"
x="82.303215" x="82.303215"
sodipodi:role="line" sodipodi:role="line"
id="tspan7665-0">Foot</tspan></text> id="tspan7665-0">Hand</tspan></text>
<text <text
xml:space="preserve" xml:space="preserve"
style="font-size:18px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Standard Symbols L;-inkscape-font-specification:Standard Symbols L" style="font-size:18px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Standard Symbols L;-inkscape-font-specification:Standard Symbols L"

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 850 KiB

After

Width:  |  Height:  |  Size: 850 KiB

2
src/app/valentina/mainwindow.cpp
View File

@ -158,6 +158,8 @@ MainWindow::MainWindow(QWidget *parent)
ui->toolBarStages->setIconSize(QSize(24, 24)); ui->toolBarStages->setIconSize(QSize(24, 24));
ui->toolBarTools->setIconSize(QSize(24, 24)); ui->toolBarTools->setIconSize(QSize(24, 24));
setUnifiedTitleAndToolBarOnMac(true);
#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 2) #if QT_VERSION >= QT_VERSION_CHECK(5, 0, 2)
// Mac OS Dock Menu // Mac OS Dock Menu
QMenu *menu = new QMenu(this); QMenu *menu = new QMenu(this);