Temp fix for seek arrows color

This commit is contained in:
xarkes 2018-03-08 10:11:19 +01:00
parent a1fba8e6b1
commit 1b7462327e
3 changed files with 34 additions and 57 deletions

View File

@ -114,20 +114,6 @@ void MainWindow::initUI()
QTabBar *centralbar = ui->centralTabWidget->tabBar();
centralbar->setVisible(false);
// Sepparator between back/forward and undo/redo buttons
QWidget *spacer4 = new QWidget();
spacer4->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Expanding);
spacer4->setMinimumSize(10, 10);
ui->mainToolBar->insertWidget(ui->actionForward, spacer4);
ui->actionForward->setIcon(QIcon(new SvgIconEngine(QString(":/img/icons/arrow_right.svg"))));
// Popup menu on theme toolbar button
QToolButton *backButton = new QToolButton(this);
backButton->setIcon(QIcon(new SvgIconEngine(QString(":/img/icons/arrow_left.svg"))));
//backButton->setPopupMode(QToolButton::DelayedPopup);
ui->mainToolBar->insertWidget(ui->actionForward, backButton);
connect(backButton, SIGNAL(clicked()), this, SLOT(backButton_clicked()));
// Sepparator between undo/redo and goto lineEdit
QWidget *spacer3 = new QWidget();
spacer3->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
@ -508,11 +494,6 @@ void MainWindow::toggleDockWidget(QDockWidget *dock_widget, bool show)
}
}
void MainWindow::backButton_clicked()
{
core->seekPrev();
}
void MainWindow::restoreDocks()
{
// In the upper half the functions are the first widget
@ -688,16 +669,6 @@ void MainWindow::on_actionSaveAs_triggered()
saveProjectAs();
}
void MainWindow::on_actionUndoSeek_triggered()
{
Core()->seekPrev();
}
void MainWindow::on_actionRedoSeek_triggered()
{
Core()->seekNext();
}
void MainWindow::on_actionRun_Script_triggered()
{
QFileDialog dialog(this);
@ -749,9 +720,24 @@ void MainWindow::on_actionQuit_triggered()
close();
}
void MainWindow::on_actionBackward_triggered()
{
Core()->seekPrev();
}
void MainWindow::on_actionForward_triggered()
{
core->seekNext();
Core()->seekNext();
}
void MainWindow::on_actionUndoSeek_triggered()
{
Core()->seekPrev();
}
void MainWindow::on_actionRedoSeek_triggered()
{
Core()->seekNext();
}
void MainWindow::on_actionDisasAdd_comment_triggered()

View File

@ -109,8 +109,6 @@ public slots:
void toggleResponsive(bool maybe);
void backButton_clicked();
private slots:
void on_actionAbout_triggered();
@ -127,13 +125,13 @@ private slots:
void on_actionSave_triggered();
void on_actionSaveAs_triggered();
void on_actionBackward_triggered();
void on_actionForward_triggered();
void on_actionUndoSeek_triggered();
void on_actionRedoSeek_triggered();
void on_actionOpen_triggered();
void on_actionForward_triggered();
void on_actionTabs_on_Top_triggered();
void on_actionReset_settings_triggered();

View File

@ -61,15 +61,7 @@ QToolTip {
color: rgb(232, 232, 232);
font: 11pt "Monaco";
}
/*
QDockWidget::title {
background: rgb(64, 66, 68);
}
QDockWidget {
color: rgb(232, 232, 232);
}
*/</string>
</string>
</property>
<property name="documentMode">
<bool>false</bool>
@ -282,21 +274,21 @@ border-top: 0px;
<string notr="true">Main toolbar</string>
</property>
<property name="styleSheet">
<string notr="true">QToolButton { /* all types of tool button */
margin-bottom: 1px;
margin-top: 1px;
<string notr="true">
QToolButton {
margin: 1px;
margin-left: 2px;
margin-right: 2px;
padding: 2px;
padding-left: 7px;
padding-right: 7px;
background-color: palette(light);
border-radius: 6px;
background-color: #ffffff;
}
QToolButton:pressed {
background-color: palette(dark);
}</string>
}
</string>
</property>
<property name="movable">
<bool>false</bool>
@ -316,6 +308,7 @@ QToolButton:pressed {
<attribute name="toolBarBreak">
<bool>false</bool>
</attribute>
<addaction name="actionBackward"/>
<addaction name="actionForward"/>
</widget>
<action name="actionDefault">
@ -432,7 +425,7 @@ QToolButton:pressed {
<string>Find previous</string>
</property>
</action>
<action name="actionBack">
<action name="actionBackward">
<property name="icon">
<iconset resource="resources.qrc">
<normaloff>:/img/icons/arrow_left.svg</normaloff>:/img/icons/arrow_left.svg</iconset>