geos_one/CASA
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix Linux build until we decide which gtk-sharp is in use.

Browse Source
This commit is contained in:
Jim Norman 2006-08-11 14:39:06 +00:00
parent 2d3518d9bd
commit a4274bf110
3 changed files with 14 additions and 4 deletions

3
CASA/gui/CommonGUI.cs

@ -216,6 +216,7 @@ namespace Novell.CASA.GUI
} }
} }
#if W32
public static string FileChooser(FileChooserAction action, String sWindowTitle, String sCurrentFolder, String sHintFileName) public static string FileChooser(FileChooserAction action, String sWindowTitle, String sCurrentFolder, String sHintFileName)
{ {
FileChooserDialog chooser = new FileChooserDialog (sWindowTitle, FileChooserDialog chooser = new FileChooserDialog (sWindowTitle,
@ -263,7 +264,7 @@ namespace Novell.CASA.GUI
chooser.Destroy(); chooser.Destroy();
return ret; return ret;
} }
#endif
/// <summary> /// <summary>
/// VerifyMasterPasswordWithUser dialog /// VerifyMasterPasswordWithUser dialog
/// </summary> /// </summary>

9
CASA/gui/ExportSecrets.cs

@ -95,8 +95,7 @@ namespace Novell.CASA.GUI
if (iLastSlash > 0) if (iLastSlash > 0)
{ {
sHintFile = sFileName.Substring(iLastSlash + 1); sHintFile = sFileName.Substring(iLastSlash + 1);
sHintDir = sFileName.Substring(8, sFileName.Length - sHintFile.Length - 8); sHintDir = sFileName.Substring(8, sFileName.Length - sHintFile.Length - 8); }
}
// save for later use // save for later use
m_config.SetConfigSetting(CommonGUI.HINT_DIR, sHintDir); m_config.SetConfigSetting(CommonGUI.HINT_DIR, sHintDir);
@ -134,7 +133,13 @@ namespace Novell.CASA.GUI
private string GetStorageFileName(string sHintDir, string sHintFile) private string GetStorageFileName(string sHintDir, string sHintFile)
{ {
#if W32
String sFileName = CommonGUI.FileChooser(FileChooserAction.Save, "Select filename and location for secrets", sHintDir, sHintFile); String sFileName = CommonGUI.FileChooser(FileChooserAction.Save, "Select filename and location for secrets", sHintDir, sHintFile);
#else
String sFileName = null;
CommonGUI.DisplayMessage(Gtk.MessageType.Info, "Not implemented");
#endif
return sFileName; return sFileName;
} }

6
CASA/gui/ImportSecrets.cs

@ -31,9 +31,13 @@ namespace Novell.CASA.GUI
{ {
String sHintDir = m_config.GetConfigSetting(CommonGUI.HINT_DIR, null);; String sHintDir = m_config.GetConfigSetting(CommonGUI.HINT_DIR, null);;
String sHintFilename = m_config.GetConfigSetting(CommonGUI.HINT_FILENAME, null); String sHintFilename = m_config.GetConfigSetting(CommonGUI.HINT_FILENAME, null);
#if W32
// ask the user to locate the secret file to import // ask the user to locate the secret file to import
string sFile = CommonGUI.FileChooser(Gtk.FileChooserAction.Open, "Select import file", sHintDir, sHintFilename); string sFile = CommonGUI.FileChooser(Gtk.FileChooserAction.Open, "Select import file", sHintDir, sHintFilename);
#else
string sFile = null;
CommonGUI.DisplayMessage(Gtk.MessageType.Info, "Not implemented");
#endif
if (sFile != null) if (sFile != null)
{ {
// parse of the file:/// // parse of the file:///