use smaller icon size for toolbar
@ -3,5 +3,8 @@
|
|||||||
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
|
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
|
||||||
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
|
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
|
||||||
width="512px" height="512px" viewBox="0 0 512 512" style="enable-background:new 0 0 512 512;" xml:space="preserve">
|
width="512px" height="512px" viewBox="0 0 512 512" style="enable-background:new 0 0 512 512;" xml:space="preserve">
|
||||||
<rect x="64" y="224" width="384" height="64"/>
|
<path d="M341,128V99c0-19.1-14.5-35-34.5-35H205.4C185.5,64,171,79.9,171,99v29H80v32h9.2c0,0,5.4,0.6,8.2,3.4c2.8,2.8,3.9,9,3.9,9
|
||||||
|
l19,241.7c1.5,29.4,1.5,33.9,36,33.9h199.4c34.5,0,34.5-4.4,36-33.8l19-241.6c0,0,1.1-6.3,3.9-9.1c2.8-2.8,8.2-3.4,8.2-3.4h9.2v-32
|
||||||
|
h-91V128z M192,99c0-9.6,7.8-15,17.7-15h91.7c9.9,0,18.6,5.5,18.6,15v29H192V99z M183.5,384l-10.3-192h20.3L204,384H183.5z
|
||||||
|
M267.1,384h-22V192h22V384z M328.7,384h-20.4l10.5-192h20.3L328.7,384z"/>
|
||||||
</svg>
|
</svg>
|
||||||
|
Before Width: | Height: | Size: 538 B After Width: | Height: | Size: 944 B |
@ -3,5 +3,8 @@
|
|||||||
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
|
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
|
||||||
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
|
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
|
||||||
width="512px" height="512px" viewBox="0 0 512 512" style="enable-background:new 0 0 512 512;" xml:space="preserve">
|
width="512px" height="512px" viewBox="0 0 512 512" style="enable-background:new 0 0 512 512;" xml:space="preserve">
|
||||||
<rect x="64" y="224" width="384" height="64"/>
|
<path d="M341,128V99c0-19.1-14.5-35-34.5-35H205.4C185.5,64,171,79.9,171,99v29H80v32h9.2c0,0,5.4,0.6,8.2,3.4c2.8,2.8,3.9,9,3.9,9
|
||||||
|
l19,241.7c1.5,29.4,1.5,33.9,36,33.9h199.4c34.5,0,34.5-4.4,36-33.8l19-241.6c0,0,1.1-6.3,3.9-9.1c2.8-2.8,8.2-3.4,8.2-3.4h9.2v-32
|
||||||
|
h-91V128z M192,99c0-9.6,7.8-15,17.7-15h91.7c9.9,0,18.6,5.5,18.6,15v29H192V99z M183.5,384l-10.3-192h20.3L204,384H183.5z
|
||||||
|
M267.1,384h-22V192h22V384z M328.7,384h-20.4l10.5-192h20.3L328.7,384z"/>
|
||||||
</svg>
|
</svg>
|
||||||
|
Before Width: | Height: | Size: 538 B After Width: | Height: | Size: 944 B |
@ -3,7 +3,7 @@
|
|||||||
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
|
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
|
||||||
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
|
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
|
||||||
width="512px" height="512px" viewBox="0 0 512 512" style="enable-background:new 0 0 512 512;" xml:space="preserve">
|
width="512px" height="512px" viewBox="0 0 512 512" style="enable-background:new 0 0 512 512;" xml:space="preserve">
|
||||||
<path d="M341,128V99c0-19.1-14.5-35-34.5-35H205.4C185.5,64,171,79.9,171,99v29H80v32h9.2c0,0,5.4,0.6,8.2,3.4c2.8,2.8,3.9,9,3.9,9
|
<path style="fill:#C9302C" d="M341,128V99c0-19.1-14.5-35-34.5-35H205.4C185.5,64,171,79.9,171,99v29H80v32h9.2c0,0,5.4,0.6,8.2,3.4c2.8,2.8,3.9,9,3.9,9
|
||||||
l19,241.7c1.5,29.4,1.5,33.9,36,33.9h199.4c34.5,0,34.5-4.4,36-33.8l19-241.6c0,0,1.1-6.3,3.9-9.1c2.8-2.8,8.2-3.4,8.2-3.4h9.2v-32
|
l19,241.7c1.5,29.4,1.5,33.9,36,33.9h199.4c34.5,0,34.5-4.4,36-33.8l19-241.6c0,0,1.1-6.3,3.9-9.1c2.8-2.8,8.2-3.4,8.2-3.4h9.2v-32
|
||||||
h-91V128z M192,99c0-9.6,7.8-15,17.7-15h91.7c9.9,0,18.6,5.5,18.6,15v29H192V99z M183.5,384l-10.3-192h20.3L204,384H183.5z
|
h-91V128z M192,99c0-9.6,7.8-15,17.7-15h91.7c9.9,0,18.6,5.5,18.6,15v29H192V99z M183.5,384l-10.3-192h20.3L204,384H183.5z
|
||||||
M267.1,384h-22V192h22V384z M328.7,384h-20.4l10.5-192h20.3L328.7,384z"/>
|
M267.1,384h-22V192h22V384z M328.7,384h-20.4l10.5-192h20.3L328.7,384z"/>
|
||||||
|
Before Width: | Height: | Size: 944 B After Width: | Height: | Size: 965 B |
@ -3,5 +3,8 @@
|
|||||||
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
|
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
|
||||||
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
|
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
|
||||||
width="512px" height="512px" viewBox="0 0 512 512" style="enable-background:new 0 0 512 512;" xml:space="preserve">
|
width="512px" height="512px" viewBox="0 0 512 512" style="enable-background:new 0 0 512 512;" xml:space="preserve">
|
||||||
<rect x="64" y="224" width="384" height="64"/>
|
<path d="M341,128V99c0-19.1-14.5-35-34.5-35H205.4C185.5,64,171,79.9,171,99v29H80v32h9.2c0,0,5.4,0.6,8.2,3.4c2.8,2.8,3.9,9,3.9,9
|
||||||
|
l19,241.7c1.5,29.4,1.5,33.9,36,33.9h199.4c34.5,0,34.5-4.4,36-33.8l19-241.6c0,0,1.1-6.3,3.9-9.1c2.8-2.8,8.2-3.4,8.2-3.4h9.2v-32
|
||||||
|
h-91V128z M192,99c0-9.6,7.8-15,17.7-15h91.7c9.9,0,18.6,5.5,18.6,15v29H192V99z M183.5,384l-10.3-192h20.3L204,384H183.5z
|
||||||
|
M267.1,384h-22V192h22V384z M328.7,384h-20.4l10.5-192h20.3L328.7,384z"/>
|
||||||
</svg>
|
</svg>
|
||||||
|
Before Width: | Height: | Size: 538 B After Width: | Height: | Size: 944 B |
@ -1,5 +1,5 @@
|
|||||||
QPushButton[CornerBtn="true"] {
|
QPushButton[CornerBtn="true"] {
|
||||||
padding: 4px 0px 4px 0px;
|
padding: 4px -2px 4px -2px;
|
||||||
margin: 0px;
|
margin: 0px;
|
||||||
border: none;
|
border: none;
|
||||||
background-color: transparent;
|
background-color: transparent;
|
||||||
|
@ -194,16 +194,22 @@ QWidget *VMainWindow::setupDirectoryPanel()
|
|||||||
|
|
||||||
void VMainWindow::initToolBar()
|
void VMainWindow::initToolBar()
|
||||||
{
|
{
|
||||||
initFileToolBar();
|
const int tbIconSize = 20 * VUtils::calculateScaleFactor();
|
||||||
initViewToolBar();
|
QSize iconSize(tbIconSize, tbIconSize);
|
||||||
initEditToolBar();
|
|
||||||
|
initFileToolBar(iconSize);
|
||||||
|
initViewToolBar(iconSize);
|
||||||
|
initEditToolBar(iconSize);
|
||||||
}
|
}
|
||||||
|
|
||||||
void VMainWindow::initViewToolBar()
|
void VMainWindow::initViewToolBar(QSize p_iconSize)
|
||||||
{
|
{
|
||||||
QToolBar *viewToolBar = addToolBar(tr("View"));
|
QToolBar *viewToolBar = addToolBar(tr("View"));
|
||||||
viewToolBar->setObjectName("ViewToolBar");
|
viewToolBar->setObjectName("ViewToolBar");
|
||||||
viewToolBar->setMovable(false);
|
viewToolBar->setMovable(false);
|
||||||
|
if (p_iconSize.isValid()) {
|
||||||
|
viewToolBar->setIconSize(p_iconSize);
|
||||||
|
}
|
||||||
|
|
||||||
QAction *onePanelViewAct = new QAction(QIcon(":/resources/icons/one_panel.svg"),
|
QAction *onePanelViewAct = new QAction(QIcon(":/resources/icons/one_panel.svg"),
|
||||||
tr("&Single Panel"), this);
|
tr("&Single Panel"), this);
|
||||||
@ -244,11 +250,14 @@ static void setActionsEnabled(QWidget *p_widget, bool p_enabled)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void VMainWindow::initEditToolBar()
|
void VMainWindow::initEditToolBar(QSize p_iconSize)
|
||||||
{
|
{
|
||||||
m_editToolBar = addToolBar(tr("Edit Toolbar"));
|
m_editToolBar = addToolBar(tr("Edit Toolbar"));
|
||||||
m_editToolBar->setObjectName("EditToolBar");
|
m_editToolBar->setObjectName("EditToolBar");
|
||||||
m_editToolBar->setMovable(false);
|
m_editToolBar->setMovable(false);
|
||||||
|
if (p_iconSize.isValid()) {
|
||||||
|
m_editToolBar->setIconSize(p_iconSize);
|
||||||
|
}
|
||||||
|
|
||||||
m_editToolBar->addSeparator();
|
m_editToolBar->addSeparator();
|
||||||
|
|
||||||
@ -307,11 +316,14 @@ void VMainWindow::initEditToolBar()
|
|||||||
setActionsEnabled(m_editToolBar, false);
|
setActionsEnabled(m_editToolBar, false);
|
||||||
}
|
}
|
||||||
|
|
||||||
void VMainWindow::initFileToolBar()
|
void VMainWindow::initFileToolBar(QSize p_iconSize)
|
||||||
{
|
{
|
||||||
QToolBar *fileToolBar = addToolBar(tr("Note"));
|
QToolBar *fileToolBar = addToolBar(tr("Note"));
|
||||||
fileToolBar->setObjectName("NoteToolBar");
|
fileToolBar->setObjectName("NoteToolBar");
|
||||||
fileToolBar->setMovable(false);
|
fileToolBar->setMovable(false);
|
||||||
|
if (p_iconSize.isValid()) {
|
||||||
|
fileToolBar->setIconSize(p_iconSize);
|
||||||
|
}
|
||||||
|
|
||||||
newRootDirAct = new QAction(QIcon(":/resources/icons/create_rootdir_tb.svg"),
|
newRootDirAct = new QAction(QIcon(":/resources/icons/create_rootdir_tb.svg"),
|
||||||
tr("New &Root Folder"), this);
|
tr("New &Root Folder"), this);
|
||||||
|
@ -132,11 +132,11 @@ private:
|
|||||||
QWidget *setupDirectoryPanel();
|
QWidget *setupDirectoryPanel();
|
||||||
|
|
||||||
void initToolBar();
|
void initToolBar();
|
||||||
void initFileToolBar();
|
void initFileToolBar(QSize p_iconSize = QSize());
|
||||||
void initViewToolBar();
|
void initViewToolBar(QSize p_iconSize = QSize());
|
||||||
|
|
||||||
// Init the Edit toolbar.
|
// Init the Edit toolbar.
|
||||||
void initEditToolBar();
|
void initEditToolBar(QSize p_iconSize = QSize());
|
||||||
|
|
||||||
void initMenuBar();
|
void initMenuBar();
|
||||||
void initFileMenu();
|
void initFileMenu();
|
||||||
|