Merge branch 'dev' into hidpi-icons
This commit is contained in:
@@ -645,9 +645,8 @@ void RTWindow::addBatchQueueJob (BatchQueueEntry* bqe, bool head)
|
||||
fpanel->queue_draw ();
|
||||
}
|
||||
|
||||
void RTWindow::addBatchQueueJobs (std::vector<BatchQueueEntry*> &entries)
|
||||
void RTWindow::addBatchQueueJobs(const std::vector<BatchQueueEntry*>& entries)
|
||||
{
|
||||
|
||||
bpanel->addBatchQueueJobs (entries, false);
|
||||
fpanel->queue_draw ();
|
||||
}
|
||||
@@ -809,19 +808,19 @@ void RTWindow::showPreferences ()
|
||||
}
|
||||
}
|
||||
|
||||
void RTWindow::setProgress (double p)
|
||||
void RTWindow::setProgress(double p)
|
||||
{
|
||||
prProgBar.set_fraction (p);
|
||||
prProgBar.set_fraction(p);
|
||||
}
|
||||
|
||||
void RTWindow::setProgressStr (Glib::ustring str)
|
||||
void RTWindow::setProgressStr(const Glib::ustring& str)
|
||||
{
|
||||
if (!options.mainNBVertical) {
|
||||
prProgBar.set_text ( str );
|
||||
prProgBar.set_text(str);
|
||||
}
|
||||
}
|
||||
|
||||
void RTWindow::setProgressState (bool inProcessing)
|
||||
void RTWindow::setProgressState(bool inProcessing)
|
||||
{
|
||||
if (inProcessing) {
|
||||
prProgBar.show();
|
||||
@@ -830,6 +829,11 @@ void RTWindow::setProgressState (bool inProcessing)
|
||||
}
|
||||
}
|
||||
|
||||
void RTWindow::error(const Glib::ustring& descr)
|
||||
{
|
||||
prProgBar.set_text(descr);
|
||||
}
|
||||
|
||||
void RTWindow::toggle_fullscreen ()
|
||||
{
|
||||
if (is_fullscreen) {
|
||||
@@ -853,11 +857,6 @@ void RTWindow::toggle_fullscreen ()
|
||||
}
|
||||
}
|
||||
|
||||
void RTWindow::error (Glib::ustring descr)
|
||||
{
|
||||
prProgBar.set_text ( descr );
|
||||
}
|
||||
|
||||
void RTWindow::SetEditorCurrent()
|
||||
{
|
||||
mainNB->set_current_page (mainNB->page_num (*epanel));
|
||||
|
Reference in New Issue
Block a user