Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixing #1860

This commit is contained in:
fgerlits 2006-10-18 18:00:14 +00:00
parent 34bb96584f
commit e616db5419
3 changed files with 25 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
livesupport/src/products/gLiveSupport/src/LoginWindow.cxx
View File

@ -202,6 +202,7 @@ LoginWindow :: LoginWindow (Ptr<GLiveSupport>::Ref gLiveSupport,
set_name("loginWindow");
set_modal(true);
property_window_position().set_value(Gtk::WIN_POS_CENTER);
set_keep_above(true);
set_resizable(false);
property_destroy_with_parent().set_value(false);
set_default(*okButton);

38
livesupport/src/products/gLiveSupport/src/MasterPanelWindow.cxx
View File

@ -466,9 +466,7 @@ MasterPanelWindow :: updateLiveModeWindow(Ptr<Playable>::Ref playable)
liveModeWindow->addItem(playable);
}
if (!liveModeWindow->is_visible()) {
liveModeWindow->show();
}
liveModeWindow->present();
}
@ -476,7 +474,7 @@ MasterPanelWindow :: updateLiveModeWindow(Ptr<Playable>::Ref playable)
* The event when the upload file button has been clicked.
*----------------------------------------------------------------------------*/
void
MasterPanelWindow :: onUploadFileButtonClicked(void) throw ()
MasterPanelWindow :: updateUploadFileWindow(void) throw ()
{
if (!uploadFileWindow.get()) {
Ptr<ResourceBundle>::Ref bundle;
@ -490,15 +488,9 @@ MasterPanelWindow :: onUploadFileButtonClicked(void) throw ()
uploadFileWindow.reset(new UploadFileWindow(gLiveSupport,
bundle,
uploadFileButton));
uploadFileWindow->show();
return;
}
if (!uploadFileWindow->is_visible()) {
uploadFileWindow->show();
} else {
uploadFileWindow->hide();
}
uploadFileWindow->present();
}
@ -538,9 +530,7 @@ MasterPanelWindow :: updateScratchpadWindow(Ptr<Playable>::Ref playable)
scratchpadWindow->addItem(playable);
}
if (!scratchpadWindow->is_visible()) {
scratchpadWindow->show();
}
scratchpadWindow->present();
}
@ -567,9 +557,7 @@ MasterPanelWindow :: updateSimplePlaylistMgmtWindow(void) throw ()
simplePlaylistMgmtWindow->showContents();
if (!simplePlaylistMgmtWindow->is_visible()) {
simplePlaylistMgmtWindow->show();
}
simplePlaylistMgmtWindow->present();
}
@ -611,9 +599,7 @@ MasterPanelWindow :: updateSchedulerWindow(
return;
}
if (!schedulerWindow->is_visible()) {
schedulerWindow->show();
}
schedulerWindow->present();
}
@ -637,9 +623,7 @@ MasterPanelWindow :: updateSearchWindow(void) throw ()
searchButton));
}
if (!searchWindow->is_visible()) {
searchWindow->show();
}
searchWindow->present();
}
@ -667,9 +651,7 @@ MasterPanelWindow :: updateOptionsWindow(void) throw ()
}
}
if (!optionsWindow->is_visible()) {
optionsWindow->show();
}
optionsWindow->present();
}
@ -885,9 +867,7 @@ MasterPanelWindow :: uploadToHub(Ptr<Playable>::Ref playable)
bool success = searchWindow->uploadToHub(playable);
if (success && !searchWindow->is_visible()) {
searchWindow->show();
}
searchWindow->present();
}

16
livesupport/src/products/gLiveSupport/src/MasterPanelWindow.h
View File

@ -291,7 +291,15 @@ class MasterPanelWindow : public Gtk::Window, public LocalizedObject
* pressed.
*/
virtual void
onUploadFileButtonClicked(void) throw ();
onUploadFileButtonClicked(void) throw ()
{
if (!uploadFileWindow ||
uploadFileWindow && !uploadFileWindow->is_visible()) {
updateUploadFileWindow();
} else {
uploadFileWindow->hide();
}
}
/**
* Function to catch the event of the live mode button being
@ -469,6 +477,12 @@ class MasterPanelWindow : public Gtk::Window, public LocalizedObject
void
createScratchpadWindow(void) throw ();
/**
* Update the Upload File window.
*/
void
updateUploadFileWindow(void) throw ();
/**
* Update the Scratchpad window.
*/