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

Rename CASA-1.5.glade to CASA.glade

Browse Source
This commit is contained in:
Jim Norman 2006-02-01 16:50:36 +00:00
parent 2277926029
commit a03cc34f33
4 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
c_gui/Common.cs
View File

@ -167,8 +167,7 @@ public class Common
if ( (128 == platform) || (4 == platform) ) if ( (128 == platform) || (4 == platform) )
{ {
IS_LINUX = true; IS_LINUX = true;
GladeFile = "/opt/novell/CASA/images/casa-1.5.glade"; GladeFile = "/opt/novell/CASA/images/casa.glade";
//GladeFile = "./images/casa-1.5.glade";
if( !File.Exists(GladeFile) ) if( !File.Exists(GladeFile) )
{ {
@ -181,9 +180,8 @@ public class Common
} }
else else
{ {
IS_WINDOWS = true; IS_WINDOWS = true;
//Common.GladeFile = Environment.GetEnvironmentVariable("HOMEDRIVE") + "\\Program Files\\Novell\\CASA\\images\\casa-1.5.glade"; GladeFile = "..\\images\\casa.glade";
GladeFile = "..\\images\\casa-1.5.glade";
if( !File.Exists(GladeFile) ) if( !File.Exists(GladeFile) )
{ {
Logger.DbgLog("GUI:CasaMain.SetGladeFilePath() - ERROR: Glade file could not be found."); Logger.DbgLog("GUI:CasaMain.SetGladeFilePath() - ERROR: Glade file could not be found.");

4
c_gui/CommonGUI.cs
View File

@ -76,10 +76,10 @@ namespace Novell.CASA.GUI
//Logger.DbgLog("GUI:CasaMain.Login() - IsMasterPasswordSet returned false"); //Logger.DbgLog("GUI:CasaMain.Login() - IsMasterPasswordSet returned false");
#if W32 #if W32
Glade.XML gxmlTemp = new Glade.XML ("../images/casa-1.5.glade", "dialogLogin", null); Glade.XML gxmlTemp = new Glade.XML ("../images/casa.glade", "dialogLogin", null);
#endif #endif
#if LINUX #if LINUX
Glade.XML gxmlTemp = new Glade.XML ("/opt/novell/CASA/images/casa-1.5.glade", "dialogLogin", null); Glade.XML gxmlTemp = new Glade.XML ("/opt/novell/CASA/images/casa.glade", "dialogLogin", null);
#endif #endif
gxmlTemp.Autoconnect (this); gxmlTemp.Autoconnect (this);
//dialogLogin.TransientFor = windowMain; //dialogLogin.TransientFor = windowMain;

7
c_gui/images/casa-1.5.glade → c_gui/images/casa.glade
View File

@ -4680,7 +4680,7 @@ CSL Manojna&lt;/b&gt;</property>
<property name="left_margin">0</property> <property name="left_margin">0</property>
<property name="right_margin">0</property> <property name="right_margin">0</property>
<property name="indent">0</property> <property name="indent">0</property>
<property name="text" translatable="yes"> * Copyright (C) 2005-2006 Novell, Inc. <property name="text" translatable="yes"> * Copyright (C) 2005-2006 Novell, Inc. All Rights Reserved.
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public * modify it under the terms of the GNU Lesser General Public
@ -4690,11 +4690,10 @@ CSL Manojna&lt;/b&gt;</property>
* This library is distributed in the hope that it will be useful, * This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Library General Public License for more details. * Library Lesser General Public License for more details.
* *
* You should have received a copy of the GNU Lesser General Public * You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free * License along with this library; if not, Novell, Inc.
* Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
* *
* To contact Novell about this file by physical or electronic mail, * To contact Novell about this file by physical or electronic mail,
* you may find current contact information at www.novell.com.</property> * you may find current contact information at www.novell.com.</property>

4
c_gui/images/casa-1.5.gladep → c_gui/images/casa.gladep
View File

@ -2,8 +2,8 @@
<!DOCTYPE glade-project SYSTEM "http://glade.gnome.org/glade-project-2.0.dtd"> <!DOCTYPE glade-project SYSTEM "http://glade.gnome.org/glade-project-2.0.dtd">
<glade-project> <glade-project>
<name>Casa-1.5</name> <name>Casa</name>
<program_name>casa-1.5</program_name> <program_name>casa</program_name>
<pixmaps_directory></pixmaps_directory> <pixmaps_directory></pixmaps_directory>
<gnome_support>FALSE</gnome_support> <gnome_support>FALSE</gnome_support>
</glade-project> </glade-project>