vitalif
/
openscad
mirror of https://github.com/vitalif/openscad
1
0
Fork 0
Code Issues Releases Wiki Activity

Clarify editor zoom to be font size change and add proper icons.

master
Torsten Paul 2015-01-13 02:26:12 +01:00
parent 303217d0b9
commit 366663610f
7 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
images/zoom-text-in-white.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 581 B

BIN
images/zoom-text-in.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 530 B

BIN
images/zoom-text-out-white.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 582 B

BIN
images/zoom-text-out.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 535 B

4
openscad.qrc
View File

@ -1,5 +1,9 @@
<RCC>
<qresource prefix="/">
<file>images/zoom-text-in-white.png</file>
<file>images/zoom-text-in.png</file>
<file>images/zoom-text-out-white.png</file>
<file>images/zoom-text-out.png</file>
<file>images/Command-Redo-32-white.png</file>
<file>images/Command-Reset-32-white.png</file>
<file>images/Command-Undo-32-white.png</file>

12
src/MainWindow.ui
View File

@ -317,8 +317,8 @@
<addaction name="editActionFindPrevious"/>
<addaction name="editActionUseSelectionForFind"/>
<addaction name="separator"/>
<addaction name="editActionZoomIn"/>
<addaction name="editActionZoomOut"/>
<addaction name="editActionZoomTextIn"/>
<addaction name="editActionZoomTextOut"/>
<addaction name="editActionPreferences"/>
</widget>
<widget class="QMenu" name="menu_Design">
@ -714,17 +714,17 @@
<string>Paste viewport rotation</string>
</property>
</action>
<action name="editActionZoomIn">
<action name="editActionZoomTextIn">
<property name="text">
<string>Zoom In</string>
<string>Increase Font Size</string>
</property>
<property name="shortcut">
<string>Ctrl++</string>
</property>
</action>
<action name="editActionZoomOut">
<action name="editActionZoomTextOut">
<property name="text">
<string>Zoom Out</string>
<string>Decrease Font Size</string>
</property>
<property name="shortcut">
<string>Ctrl+-</string>

10
src/mainwin.cc
View File

@ -256,7 +256,7 @@ MainWindow::MainWindow(const QString &filename)
knownFileExtensions["scad"] = "";
knownFileExtensions["csg"] = "";
editActionZoomIn->setShortcuts(QList<QKeySequence>() << editActionZoomIn->shortcuts() << QKeySequence("CTRL+="));
editActionZoomTextIn->setShortcuts(QList<QKeySequence>() << editActionZoomTextIn->shortcuts() << QKeySequence("CTRL+="));
connect(this, SIGNAL(highlightError(int)), editor, SLOT(highlightError(int)));
connect(this, SIGNAL(unhighlightLastError()), editor, SLOT(unhighlightLastError()));
@ -330,8 +330,8 @@ MainWindow::MainWindow(const QString &filename)
connect(this->editActionConvertTabsToSpaces, SIGNAL(triggered()), this, SLOT(convertTabsToSpaces()));
connect(this->editActionPasteVPT, SIGNAL(triggered()), this, SLOT(pasteViewportTranslation()));
connect(this->editActionPasteVPR, SIGNAL(triggered()), this, SLOT(pasteViewportRotation()));
connect(this->editActionZoomIn, SIGNAL(triggered()), editor, SLOT(zoomIn()));
connect(this->editActionZoomOut, SIGNAL(triggered()), editor, SLOT(zoomOut()));
connect(this->editActionZoomTextIn, SIGNAL(triggered()), editor, SLOT(zoomIn()));
connect(this->editActionZoomTextOut, SIGNAL(triggered()), editor, SLOT(zoomOut()));
connect(this->editActionPreferences, SIGNAL(triggered()), this, SLOT(preferences()));
// Edit->Find
connect(this->editActionFind, SIGNAL(triggered()), this, SLOT(find()));
@ -476,8 +476,8 @@ MainWindow::MainWindow(const QString &filename)
initActionIcon(fileActionNew, ":/images/blackNew.png", ":/images/Document-New-128.png");
initActionIcon(fileActionOpen, ":/images/Open-32.png", ":/images/Open-128.png");
initActionIcon(fileActionSave, ":/images/Save-32.png", ":/images/Save-128.png");
initActionIcon(editActionZoomIn, ":/images/zoomin.png", ":/images/Zoom-In-32.png");
initActionIcon(editActionZoomOut, ":/images/zoomout.png", ":/images/Zoom-Out-32.png");
initActionIcon(editActionZoomTextIn, ":/images/zoom-text-in.png", ":/images/zoom-text-in-white.png");
initActionIcon(editActionZoomTextOut, ":/images/zoom-text-out.png", ":/images/zoom-text-out-white.png");
initActionIcon(designActionRender, ":/images/blackRender.png", ":/images/Arrowhead-Right-32.png");
initActionIcon(viewActionShowAxes, ":/images/blackaxes.png", ":/images/axes.png");
initActionIcon(viewActionShowEdges, ":/images/Rotation-32.png", ":/images/grid.png");