Merge pull request #4832 from Beep6581/stylefixes

Button and progress bar style improvements
This commit is contained in:
Beep6581
2018-09-24 22:34:50 +02:00
committed by GitHub
3 changed files with 39 additions and 23 deletions

View File

@@ -368,29 +368,7 @@ separator {
margin: 5px;
}
progressbar.vertical trough {
min-width: 6px;
}
progressbar.vertical trough progress {
min-width: 6px;
}
progressbar.horizontal trough {
min-height: 6px;
}
progressbar.horizontal trough progress {
min-height: 6px;
}
progressbar trough {
background-color: #2A2A2A;
border-color: #202020;
}
notebook header progressbar trough {
background-color: #202020;
border-color: #181818;
}
/* */
.drawingarea {
border-radius: 0;
@@ -1016,3 +994,35 @@ button.combo, .image-combo .toggle, #MyFileChooserButton {
padding-right: 4px;
}
/* Progress bars */
progressbar.horizontal {
min-width: 100px;
margin-bottom: 2px;
}
progressbar.vertical {
min-height: 100px;
margin: 8px 0;
}
progressbar trough {
background-color: #383838;
border: none;
}
progressbar progress {
border-color: #363636;
border-radius: 3px;
background-color: #215d9c;
}
progressbar.horizontal trough, progressbar.horizontal progress {
min-height: 10px;
}
progressbar.vertical trough, progressbar.vertical progress {
min-width: 10px;
}
/* */

View File

@@ -657,18 +657,21 @@ EditorPanel::EditorPanel (FilePanel* filePanel)
Gtk::Image *saveButtonImage = Gtk::manage (new RTImage ("save.png"));
saveimgas = Gtk::manage (new Gtk::Button ());
saveimgas->set_relief(Gtk::RELIEF_NONE);
saveimgas->add (*saveButtonImage);
saveimgas->set_tooltip_markup (M ("MAIN_BUTTON_SAVE_TOOLTIP"));
setExpandAlignProperties (saveimgas, false, false, Gtk::ALIGN_CENTER, Gtk::ALIGN_FILL);
Gtk::Image *queueButtonImage = Gtk::manage (new RTImage ("gears.png"));
queueimg = Gtk::manage (new Gtk::Button ());
queueimg->set_relief(Gtk::RELIEF_NONE);
queueimg->add (*queueButtonImage);
queueimg->set_tooltip_markup (M ("MAIN_BUTTON_PUTTOQUEUE_TOOLTIP"));
setExpandAlignProperties (queueimg, false, false, Gtk::ALIGN_CENTER, Gtk::ALIGN_FILL);
Gtk::Image *sendToEditorButtonImage = Gtk::manage (new RTImage ("palette-brush.png"));
sendtogimp = Gtk::manage (new Gtk::Button ());
sendtogimp->set_relief(Gtk::RELIEF_NONE);
sendtogimp->add (*sendToEditorButtonImage);
sendtogimp->set_tooltip_markup (M ("MAIN_BUTTON_SENDTOEDITOR_TOOLTIP"));
setExpandAlignProperties (sendtogimp, false, false, Gtk::ALIGN_CENTER, Gtk::ALIGN_FILL);

View File

@@ -232,6 +232,7 @@ RTWindow::RTWindow ()
Gtk::Button* iccProfileCreator = Gtk::manage (new Gtk::Button ());
setExpandAlignProperties (iccProfileCreator, false, false, Gtk::ALIGN_CENTER, Gtk::ALIGN_CENTER);
iccProfileCreator->set_relief(Gtk::RELIEF_NONE);
iccProfileCreator->set_image (*Gtk::manage (new RTImage ("gamut-plus.png")));
iccProfileCreator->set_tooltip_markup (M ("MAIN_BUTTON_ICCPROFCREATOR"));
iccProfileCreator->signal_clicked().connect ( sigc::mem_fun (*this, &RTWindow::showICCProfileCreator) );
@@ -240,6 +241,7 @@ RTWindow::RTWindow ()
//Gtk::Button* preferences = Gtk::manage (new Gtk::Button (M("MAIN_BUTTON_PREFERENCES")+"..."));
Gtk::Button* preferences = Gtk::manage (new Gtk::Button ());
setExpandAlignProperties (preferences, false, false, Gtk::ALIGN_CENTER, Gtk::ALIGN_CENTER);
preferences->set_relief(Gtk::RELIEF_NONE);
preferences->set_image (*Gtk::manage (new RTImage ("preferences.png")));
preferences->set_tooltip_markup (M ("MAIN_BUTTON_PREFERENCES"));
preferences->signal_clicked().connect ( sigc::mem_fun (*this, &RTWindow::showPreferences) );
@@ -247,6 +249,7 @@ RTWindow::RTWindow ()
//btn_fullscreen = Gtk::manage( new Gtk::Button(M("MAIN_BUTTON_FULLSCREEN")));
btn_fullscreen = Gtk::manage ( new Gtk::Button());
setExpandAlignProperties (btn_fullscreen, false, false, Gtk::ALIGN_CENTER, Gtk::ALIGN_CENTER);
btn_fullscreen->set_relief(Gtk::RELIEF_NONE);
btn_fullscreen->set_tooltip_markup (M ("MAIN_BUTTON_FULLSCREEN"));
btn_fullscreen->set_image (*iFullscreen);
btn_fullscreen->signal_clicked().connect ( sigc::mem_fun (*this, &RTWindow::toggle_fullscreen) );