dawy_go/vnote
1
0
Fork 0
mirror of https://gitee.com/vnotex/vnote.git synced 2025-07-05 22:09:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

make all tool buttons always visible

Browse Source
This commit is contained in:
Le Tan 2017-08-01 22:44:49 +08:00
parent e88a41d4e3
commit 8595d0a14f
2 changed files with 24 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/resources/icons/save_note.svg
View File

@ -3,14 +3,14 @@
<!-- Created with SVG-edit - http://svg-edit.googlecode.com/ --> <!-- Created with SVG-edit - http://svg-edit.googlecode.com/ -->
<g> <g>
<title>Layer 1</title> <title>Layer 1</title>
<line id="svg_5" y2="489.185676" x2="44" y1="34" x1="44" stroke-linecap="null" stroke-linejoin="null" stroke-dasharray="null" stroke-width="40" stroke="#000000" fill="none"/> <line stroke="#000000" fill="none" stroke-width="40" stroke-dasharray="null" stroke-linejoin="null" stroke-linecap="null" x1="94" y1="54" x2="94" y2="465.185684" id="svg_5"/>
<line stroke="#000000" id="svg_6" y2="54" x2="390.999993" y1="54" x1="24" stroke-linecap="null" stroke-linejoin="null" stroke-dasharray="null" stroke-width="40" fill="none"/> <line stroke="#000000" fill="none" stroke-width="40" stroke-dasharray="null" stroke-linejoin="null" stroke-linecap="null" x1="74" y1="74" x2="364.000002" y2="74" id="svg_6"/>
<line stroke="#000000" id="svg_7" y2="469" x2="484.000004" y1="469" x1="47" stroke-linecap="null" stroke-linejoin="null" stroke-dasharray="null" stroke-width="40" fill="none"/> <line stroke="#000000" fill="none" stroke-width="40" stroke-dasharray="null" stroke-linejoin="null" stroke-linecap="null" x1="97" y1="445" x2="438.937527" y2="445" id="svg_7"/>
<line stroke="#000000" id="svg_8" y2="158.857947" x2="464" y1="476" x1="464" stroke-linecap="null" stroke-linejoin="null" stroke-dasharray="null" stroke-width="40" fill="none"/> <line stroke="#000000" fill="none" stroke-width="40" stroke-dasharray="null" stroke-linejoin="null" stroke-linecap="null" x1="419" y1="458.999994" x2="419" y2="135.201681" id="svg_8"/>
<line stroke="#000000" transform="rotate(-4.735957622528076 421.4303894042967,108.79380035400366) " id="svg_9" y2="175.227609" x2="463.123079" y1="42.359998" x1="379.737676" stroke-linecap="null" stroke-linejoin="null" stroke-dasharray="null" stroke-width="40" fill="none"/> <line stroke="#000000" fill="none" stroke-width="40" stroke-dasharray="null" stroke-linejoin="null" stroke-linecap="null" x1="352.70837" y1="64.654766" x2="420.636752" y2="151.510972" id="svg_9" transform="rotate(-4.735957622528076 386.6725463867186,108.08286285400429) "/>
<rect ry="1" rx="1" stroke="#000000" id="svg_10" height="133.000003" width="224" y="334.999998" x="136.5" stroke-linecap="null" stroke-linejoin="null" stroke-dasharray="null" stroke-width="40" fill="none"/> <rect stroke="#000000" fill="none" stroke-width="40" stroke-dasharray="null" stroke-linejoin="null" stroke-linecap="null" x="157.5" y="337.375001" width="141.3125" height="102.624999" id="svg_10" rx="1" ry="1"/>
<line id="svg_13" y2="180.117859" x2="172.5" y1="74" x1="172.5" stroke-linecap="null" stroke-linejoin="null" stroke-dasharray="null" stroke-width="40" stroke="#000000" fill="none"/> <line fill="none" stroke="#000000" stroke-width="40" stroke-dasharray="null" stroke-linejoin="null" stroke-linecap="null" x1="222.5" y1="94" x2="222.5" y2="200.117859" id="svg_13"/>
<rect stroke="#000000" id="svg_14" ry="1" rx="1" height="100.000001" width="143.000001" y="63.499997" x="134.5" stroke-linecap="null" stroke-linejoin="null" stroke-dasharray="null" stroke-width="40" fill="none"/> <rect fill="none" stroke-width="40" stroke-dasharray="null" stroke-linejoin="null" stroke-linecap="null" x="152.4375" y="83.499997" width="143.000001" height="100.000001" rx="1" ry="1" id="svg_14" stroke="#000000"/>
<line id="svg_15" y2="168.05893" x2="194.5" y1="61.941071" x1="194.5" stroke-linecap="null" stroke-linejoin="null" stroke-dasharray="null" stroke-width="40" stroke="#000000" fill="none"/> <line fill="none" stroke="#000000" stroke-width="40" stroke-dasharray="null" stroke-linejoin="null" stroke-linecap="null" x1="187.6875" y1="81.941071" x2="187.6875" y2="188.05893" id="svg_15"/>
</g> </g>
</svg> </svg>
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.0 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB

29
src/vmainwindow.cpp
View File

@ -235,12 +235,12 @@ void VMainWindow::initViewToolBar()
viewToolBar->addAction(expandViewAct); viewToolBar->addAction(expandViewAct);
} }
static void setActionsVisible(QWidget *p_widget, bool p_visible) static void setActionsEnabled(QWidget *p_widget, bool p_enabled)
{ {
Q_ASSERT(p_widget); Q_ASSERT(p_widget);
QList<QAction *> actions = p_widget->actions(); QList<QAction *> actions = p_widget->actions();
for (auto const & act : actions) { for (auto const & act : actions) {
act->setVisible(p_visible); act->setEnabled(p_enabled);
} }
} }
@ -304,7 +304,7 @@ void VMainWindow::initEditToolBar()
toggleAct->setToolTip(tr("Toggle the edit toolbar")); toggleAct->setToolTip(tr("Toggle the edit toolbar"));
viewMenu->addAction(toggleAct); viewMenu->addAction(toggleAct);
setActionsVisible(m_editToolBar, false); setActionsEnabled(m_editToolBar, false);
} }
void VMainWindow::initFileToolBar() void VMainWindow::initFileToolBar()
@ -394,13 +394,13 @@ void VMainWindow::initFileToolBar()
newRootDirAct->setEnabled(false); newRootDirAct->setEnabled(false);
newNoteAct->setEnabled(false); newNoteAct->setEnabled(false);
noteInfoAct->setVisible(false); noteInfoAct->setEnabled(false);
deleteNoteAct->setVisible(false); deleteNoteAct->setEnabled(false);
m_closeNoteAct->setVisible(false); m_closeNoteAct->setEnabled(false);
editNoteAct->setVisible(false); editNoteAct->setEnabled(false);
saveExitAct->setVisible(false); saveExitAct->setVisible(false);
discardExitAct->setVisible(false); discardExitAct->setVisible(false);
saveNoteAct->setVisible(false); saveNoteAct->setEnabled(false);
fileToolBar->addAction(newRootDirAct); fileToolBar->addAction(newRootDirAct);
fileToolBar->addAction(newNoteAct); fileToolBar->addAction(newNoteAct);
@ -1388,17 +1388,18 @@ void VMainWindow::updateActionStateFromTabStatusChange(const VFile *p_file,
m_printAct->setEnabled(p_file && p_file->getDocType() == DocType::Markdown); m_printAct->setEnabled(p_file && p_file->getDocType() == DocType::Markdown);
m_exportAsPDFAct->setEnabled(p_file && p_file->getDocType() == DocType::Markdown); m_exportAsPDFAct->setEnabled(p_file && p_file->getDocType() == DocType::Markdown);
editNoteAct->setVisible(p_file && p_file->isModifiable() && !p_editMode);
discardExitAct->setVisible(p_file && p_editMode); discardExitAct->setVisible(p_file && p_editMode);
saveExitAct->setVisible(p_file && p_editMode); saveExitAct->setVisible(p_file && p_editMode);
saveNoteAct->setVisible(p_file && p_editMode); editNoteAct->setEnabled(p_file && p_file->isModifiable() && !p_editMode);
deleteNoteAct->setVisible(p_file && p_file->getType() == FileType::Normal); editNoteAct->setVisible(!saveExitAct->isVisible());
noteInfoAct->setVisible(p_file && !systemFile); saveNoteAct->setEnabled(p_file && p_editMode);
m_closeNoteAct->setVisible(p_file); deleteNoteAct->setEnabled(p_file && p_file->getType() == FileType::Normal);
noteInfoAct->setEnabled(p_file && !systemFile);
m_closeNoteAct->setEnabled(p_file);
m_insertImageAct->setEnabled(p_file && p_editMode); m_insertImageAct->setEnabled(p_file && p_editMode);
setActionsVisible(m_editToolBar, p_file && p_editMode); setActionsEnabled(m_editToolBar, p_file && p_editMode);
// Find/Replace // Find/Replace
m_findReplaceAct->setEnabled(p_file); m_findReplaceAct->setEnabled(p_file);