diff --git a/modules/gui/src/remote_loader.cc b/modules/gui/src/remote_loader.cc index 26b333e8108463b0fe062f8dc262cdf18b03cc39..46e2dcbc85bf0b38d6a7df88d1f542bbdb91212e 100644 --- a/modules/gui/src/remote_loader.cc +++ b/modules/gui/src/remote_loader.cc @@ -73,6 +73,8 @@ RemoteLoader::RemoteLoader(QWidget* parent): action_list_.append(select_url_action); connect(select_url_action, SIGNAL(triggered(bool)), this, SLOT(UrlClick())); + this->BuildMenu(); + this->RenameButton(); } void RemoteLoader::UrlClick() @@ -83,7 +85,7 @@ void RemoteLoader::UrlClick() void RemoteLoader::BuildMenu(String active_loader) { - if(active_loader.size()>0){ + if(!active_loader.empty()){ selected_site_loader_ = active_loader; } else if(site_actions_->checkedAction()!=NULL){ @@ -100,6 +102,7 @@ void RemoteLoader::BuildMenu(String active_loader) RemoteSiteLoader* loader = FileLoader::GetLoaderManager()->GetRemoteSiteLoader(loader_ident); if(loader && ((loader->IsImg() && img_support_) || !loader->IsImg())){ QAction* action = new QAction(loader_ident,site_loader_menu_); + connect(action, SIGNAL(triggered()), this, SLOT(RenameButton())); action->setCheckable(true); site_actions_->addAction(action); if((site_actions_->checkedAction()==NULL && loader_ident == FileLoader::GetLoaderManager()->GetDefaultRemoteSiteIdent()) ||selected_site_loader_==loader_ident.toStdString() ){ @@ -132,6 +135,10 @@ bool RemoteLoader::Restore(const QString& prefix) if (settings.contains("loader")) { this->BuildMenu(settings.value("loader").toString().toStdString()); } + else{ + this->BuildMenu(); + } + this->RenameButton(); return true; } @@ -187,6 +194,14 @@ void RemoteLoader::DownloadFinished(){ this->ShowProgressBar(false); } + +void RemoteLoader::RenameButton(){ + if(site_actions_->checkedAction()){ + QString text = "Load (" + site_actions_->checkedAction()->text() + ")"; + button_->setText(text); + } +} + OST_REGISTER_WIDGET_WITH_DEFAULT_FACTORY(ost::gui, RemoteLoader, "Remote Loader"); }} diff --git a/modules/gui/src/remote_loader.hh b/modules/gui/src/remote_loader.hh index 441309eee1f70c8db7d6583a77eae552ae8acd25..209e2bb19e4782b89db1b2b3bc211da3efb89019 100644 --- a/modules/gui/src/remote_loader.hh +++ b/modules/gui/src/remote_loader.hh @@ -53,6 +53,7 @@ private slots: void UrlClick(); void DownloadFinished(); void UpdateProgress(qint64 read, qint64 total); + void RenameButton(); private: QLineEdit* line_edit_; diff --git a/scripts/init.py b/scripts/init.py index 6df88ea013347837d43e8b155141325da09f6fb2..3a776c459daa2d00435cbb6668906999ac067c00 100644 --- a/scripts/init.py +++ b/scripts/init.py @@ -49,8 +49,8 @@ def _InitFrontEnd(): app=gui.GostyApp.Instance() app.SetAppTitle("DNG") main_area=app.perspective.main_area - _InitPanels(app) _InitMenuBar(app) + _InitPanels(app) _InitSpaceNav(app) _InitContextMenu(app) main_area.AddPersistentWidget("3D Scene", "gl_win" , app.gl_win, int(QtCore.Qt.WindowMaximized))