Bug 142475. Add EULA to install for windows and license info in help dialog.

This commit is contained in:
Jim Norman
2006-01-20 18:44:28 +00:00
parent cae3740691
commit 828e8fb186
11 changed files with 8487 additions and 8133 deletions

View File

@@ -72,7 +72,8 @@ namespace Novell.CASA.GUI
dialogSingleInstance,
dialogLoginReprompt,
dialogShortPassword,
dialogResetMP;
dialogResetMP,
dialogStillRunning;
[Glade.Widget]
Gtk.Entry entryMasterPassword1,
@@ -87,7 +88,8 @@ namespace Novell.CASA.GUI
Gtk.CheckButton checkbuttonFirefox,
checkbuttonMozilla,
checkbuttonGnomeKeyring,
checkbuttonKdeWallet;
checkbuttonKdeWallet,
checkbuttonCloseMessage;
[Glade.Widget]
Gtk.Label label88,
@@ -812,6 +814,7 @@ namespace Novell.CASA.GUI
LockGUI();
if (mCasaTray != null)
mCasaTray.UpdateTrayIcon(true);
RefreshStores();
Logger.DbgLog("GUI:CasaMain.OnLockMiCASASecrets() - END");
}
@@ -839,13 +842,12 @@ namespace Novell.CASA.GUI
mmiDestroySecrets.Sensitive = false;
notebookStores.Sensitive = false;
mmiNew.Sensitive = false;
mmiRefresh.Sensitive = false;
mmiDebug.Sensitive = false;
mmiOptions.Sensitive = false;
mmiEdit.Sensitive = false;
m_bGuiLocked = true;
m_bGuiLocked = true;
}
internal void UnlockGUI()
@@ -1389,7 +1391,9 @@ namespace Novell.CASA.GUI
{
if (m_bNotifyUser)
{
// prompt user
// StillRunning(null, null);
// prompt user
MessageDialog md=new MessageDialog(null,Gtk.DialogFlags.Modal,
Gtk.MessageType.Info,
Gtk.ButtonsType.Close,
@@ -1402,6 +1406,7 @@ namespace Novell.CASA.GUI
md.Show();
m_bNotifyUser = false;
}
mCasaTray.CasaManagerQuit();
@@ -1411,7 +1416,32 @@ namespace Novell.CASA.GUI
Application.Quit();
}
///#######################################################################
/// StillRunning
/// <summary>
///
/// </summary>
public void StillRunning(object obj, EventArgs args)
{
Logger.DbgLog("GUI:CasaMain.StillRunning() - BEGIN");
Glade.XML gxmlTemp = new Glade.XML (Common.GladeFile, "dialogStillRunning", null);
gxmlTemp.Autoconnect (this);
dialogStillRunning.TransientFor = windowMain;
Logger.DbgLog("GUI:CasaMain.StillRunning() - END");
}
public void btnStillRunning_clicked(object obj, EventArgs args)
{
if (checkbuttonCloseMessage.Active)
{
m_bNotifyUser = false;
}
dialogStillRunning.Destroy();
}
///#######################################################################
/// WINDOW MAIN FOCUS

View File

@@ -280,8 +280,12 @@ namespace Novell.CASA.GUI
{
MiCasaRequestReply.Send(MiCasaRequestReply.VERB_LOCK_STORE);
if (mCasaMain != null)
{
mCasaMain.LockGUI();
mCasaMain.RefreshStores();
}
UpdateTrayIcon(true);
}
}

File diff suppressed because it is too large Load Diff

View File

@@ -1,9 +1,9 @@
<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
<!DOCTYPE glade-project SYSTEM "http://glade.gnome.org/glade-project-2.0.dtd">
<glade-project>
<name>Casa-1.5</name>
<program_name>casa-1.5</program_name>
<pixmaps_directory></pixmaps_directory>
<gnome_support>FALSE</gnome_support>
</glade-project>
<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
<!DOCTYPE glade-project SYSTEM "http://glade.gnome.org/glade-project-2.0.dtd">
<glade-project>
<name>Casa-1.5</name>
<program_name>casa-1.5</program_name>
<pixmaps_directory></pixmaps_directory>
<gnome_support>FALSE</gnome_support>
</glade-project>