[chronojump/different_glades_2] Uses only one chronojump.glade: deletes the original chronojump.glade and changes all the source cod
- From: Carles Pina i Estany <carlespina src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump/different_glades_2] Uses only one chronojump.glade: deletes the original chronojump.glade and changes all the source cod
- Date: Sun, 16 Oct 2016 15:28:57 +0000 (UTC)
commit 3cfc45759b6d9ec6efec3c500f20d5297fd0965b
Author: Carles Pina i Estany <carles pina cat>
Date: Sun Oct 16 17:28:22 2016 +0200
Uses only one chronojump.glade: deletes the original chronojump.glade and changes all the source code to
use the new one.
glade/chronojump.glade |61919 ---------------------------------------
glade/chronojump.gladep | 8 -
src/gui/chronojump.cs | 2 +-
src/gui/chronopic.cs | 2 +-
src/gui/chronopicWizard.cs | 2 +-
src/gui/confirm.cs | 4 +-
src/gui/convertWeight.cs | 2 +-
src/gui/dialogCalendar.cs | 2 +-
src/gui/dialogImageTest.cs | 4 +-
src/gui/dialogMessage.cs | 2 +-
src/gui/dialogServerStats.cs | 2 +-
src/gui/encoderConfiguration.cs | 2 +-
src/gui/error.cs | 2 +-
src/gui/evaluator.cs | 2 +-
src/gui/event.cs | 4 +-
src/gui/eventGraphConfigure.cs | 2 +-
src/gui/executeAuto.cs | 2 +-
src/gui/genericWindow.cs | 2 +-
src/gui/helpPorts.cs | 2 +-
src/gui/jump.cs | 10 +-
src/gui/jumpType.cs | 2 +-
src/gui/multiChronopic.cs | 2 +-
src/gui/person.cs | 12 +-
src/gui/personSelect.cs | 2 +-
src/gui/preferences.cs | 2 +-
src/gui/pulse.cs | 4 +-
src/gui/queryServer.cs | 2 +-
src/gui/reactionTime.cs | 2 +-
src/gui/repetitiveConditions.cs | 2 +-
src/gui/report.cs | 2 +-
src/gui/run.cs | 10 +-
src/gui/runType.cs | 2 +-
src/gui/server.cs | 2 +-
src/gui/session.cs | 4 +-
src/gui/splash.cs | 2 +-
35 files changed, 51 insertions(+), 61978 deletions(-)
---
diff --git a/src/gui/chronojump.cs b/src/gui/chronojump.cs
index 9092ba0..da71002 100644
--- a/src/gui/chronojump.cs
+++ b/src/gui/chronojump.cs
@@ -498,7 +498,7 @@ public partial class ChronoJumpWindow
Glade.XML gxml;
- gxml = Glade.XML.FromAssembly (Util.GetGladePath() + "chronojump.glade", "app1",
"chronojump");
+ gxml = Glade.XML.FromAssembly (Util.GetGladePath() + "app1.glade", "app1", "chronojump");
gxml.Autoconnect(this);
//put an icon to window
diff --git a/src/gui/chronopic.cs b/src/gui/chronopic.cs
index e8efeb5..55c0e6c 100644
--- a/src/gui/chronopic.cs
+++ b/src/gui/chronopic.cs
@@ -160,7 +160,7 @@ public class ChronopicWindow
LogB.Debug("constructor");
Glade.XML gxml;
- gxml = Glade.XML.FromAssembly (Util.GetGladePath() + "chronojump.glade", "chronopic_window",
"chronojump");
+ gxml = Glade.XML.FromAssembly (Util.GetGladePath() + "chronopic_window.glade",
"chronopic_window", "chronojump");
gxml.Autoconnect(this);
cpd = myCpd;
diff --git a/src/gui/chronopicWizard.cs b/src/gui/chronopicWizard.cs
index c47e55b..139f2eb 100644
--- a/src/gui/chronopicWizard.cs
+++ b/src/gui/chronopicWizard.cs
@@ -81,7 +81,7 @@ public class ChronopicWizardWindow
ChronopicWizardWindow()
{
Glade.XML gladeXML;
- gladeXML = Glade.XML.FromAssembly (Util.GetGladePath() + "chronojump.glade",
"chronopic_wizard_win", "chronojump");
+ gladeXML = Glade.XML.FromAssembly (Util.GetGladePath() + "chronopic_wizard_win.glade",
"chronopic_wizard_win", "chronojump");
gladeXML.Autoconnect(this);
//put an icon to window
diff --git a/src/gui/confirm.cs b/src/gui/confirm.cs
index 3c5528b..45848f7 100644
--- a/src/gui/confirm.cs
+++ b/src/gui/confirm.cs
@@ -40,7 +40,7 @@ public class ConfirmWindowJumpRun
{
//Setup (text, table, uniqueID);
Glade.XML gladeXML;
- gladeXML = Glade.XML.FromAssembly (Util.GetGladePath() + "chronojump.glade",
"confirm_window", "chronojump");
+ gladeXML = Glade.XML.FromAssembly (Util.GetGladePath() + "confirm_window.glade",
"confirm_window", "chronojump");
gladeXML.Autoconnect(this);
//put an icon to window
@@ -106,7 +106,7 @@ public class ConfirmWindow
public ConfirmWindow (string text1, string link, string question)
{
Glade.XML gladeXML;
- gladeXML = Glade.XML.FromAssembly (Util.GetGladePath() + "chronojump.glade",
"confirm_window", null);
+ gladeXML = Glade.XML.FromAssembly (Util.GetGladePath() + "confirm_window.glade",
"confirm_window", null);
gladeXML.Autoconnect(this);
//put an icon to window
diff --git a/src/gui/convertWeight.cs b/src/gui/convertWeight.cs
index 400a818..52692b2 100644
--- a/src/gui/convertWeight.cs
+++ b/src/gui/convertWeight.cs
@@ -47,7 +47,7 @@ public class ConvertWeightWindow
ConvertWeightWindow (double oldPersonWeight, double newPersonWeight, string [] jumpsNormal, string []
jumpsReactive) {
Glade.XML gladeXML;
- gladeXML = Glade.XML.FromAssembly (Util.GetGladePath() + "chronojump.glade",
"convert_weight", null);
+ gladeXML = Glade.XML.FromAssembly (Util.GetGladePath() + "convert_weight.glade",
"convert_weight", null);
gladeXML.Autoconnect(this);
//put an icon to window
diff --git a/src/gui/dialogCalendar.cs b/src/gui/dialogCalendar.cs
index c98879a..8c29798 100644
--- a/src/gui/dialogCalendar.cs
+++ b/src/gui/dialogCalendar.cs
@@ -36,7 +36,7 @@ public class DialogCalendar
public DialogCalendar (string calendarTitle, DateTime dateInitial)
{
Glade.XML gladeXML;
- gladeXML = Glade.XML.FromAssembly (Util.GetGladePath() + "chronojump.glade",
"dialog_calendar", "chronojump");
+ gladeXML = Glade.XML.FromAssembly (Util.GetGladePath() + "dialog_calendar.glade",
"dialog_calendar", "chronojump");
gladeXML.Autoconnect(this);
signalsActive = false;
diff --git a/src/gui/dialogImageTest.cs b/src/gui/dialogImageTest.cs
index 58a91e6..9cfffa0 100644
--- a/src/gui/dialogImageTest.cs
+++ b/src/gui/dialogImageTest.cs
@@ -35,7 +35,7 @@ public class DialogImageTest
public DialogImageTest (EventType myEventType)
{
Glade.XML gladeXML;
- gladeXML = Glade.XML.FromAssembly (Util.GetGladePath() + "chronojump.glade",
"dialog_image_test", null);
+ gladeXML = Glade.XML.FromAssembly (Util.GetGladePath() + "dialog_image_test.glade",
"dialog_image_test", null);
gladeXML.Autoconnect(this);
//put an icon to window
@@ -61,7 +61,7 @@ public class DialogImageTest
public DialogImageTest (string title, string imagePath, ArchiveType archiveType)
{
Glade.XML gladeXML;
- gladeXML = Glade.XML.FromAssembly (Util.GetGladePath() + "chronojump.glade",
"dialog_image_test", "chronojump");
+ gladeXML = Glade.XML.FromAssembly (Util.GetGladePath() + "dialog_image_test.glade",
"dialog_image_test", "chronojump");
gladeXML.Autoconnect(this);
dialog_image_test.Title = title;
diff --git a/src/gui/dialogMessage.cs b/src/gui/dialogMessage.cs
index f1e7c84..39c29ff 100644
--- a/src/gui/dialogMessage.cs
+++ b/src/gui/dialogMessage.cs
@@ -55,7 +55,7 @@ public class DialogMessage
LogB.Information("Dialog message: " + message);
Glade.XML gladeXML;
- gladeXML = Glade.XML.FromAssembly (Util.GetGladePath() + "chronojump.glade",
"dialog_message", "chronojump");
+ gladeXML = Glade.XML.FromAssembly (Util.GetGladePath() + "dialog_message.glade",
"dialog_message", "chronojump");
gladeXML.Autoconnect(this);
//put an icon to window
diff --git a/src/gui/dialogServerStats.cs b/src/gui/dialogServerStats.cs
index 92b18fb..412fa50 100644
--- a/src/gui/dialogServerStats.cs
+++ b/src/gui/dialogServerStats.cs
@@ -55,7 +55,7 @@ public class DialogServerStats
public DialogServerStats (string [] statsServer, string [] statsMine)
{
Glade.XML gladeXML;
- gladeXML = Glade.XML.FromAssembly (Util.GetGladePath() + "chronojump.glade",
"dialog_server_stats", "chronojump");
+ gladeXML = Glade.XML.FromAssembly (Util.GetGladePath() + "dialog_server_stats.glade",
"dialog_server_stats", "chronojump");
gladeXML.Autoconnect(this);
diff --git a/src/gui/encoderConfiguration.cs b/src/gui/encoderConfiguration.cs
index 569d271..655a39f 100644
--- a/src/gui/encoderConfiguration.cs
+++ b/src/gui/encoderConfiguration.cs
@@ -113,7 +113,7 @@ public class EncoderConfigurationWindow
EncoderConfigurationWindow (bool definedInConfig) {
Glade.XML gladeXML;
- gladeXML = Glade.XML.FromAssembly (Util.GetGladePath() + "chronojump.glade",
"encoder_configuration", "chronojump");
+ gladeXML = Glade.XML.FromAssembly (Util.GetGladePath() + "encoder_configuration.glade",
"encoder_configuration", "chronojump");
gladeXML.Autoconnect(this);
this.definedInConfig = definedInConfig;
diff --git a/src/gui/error.cs b/src/gui/error.cs
index c94b6dd..237af88 100644
--- a/src/gui/error.cs
+++ b/src/gui/error.cs
@@ -52,7 +52,7 @@ public class ErrorWindow
{
LogB.Information("At error window2");
Glade.XML gladeXML;
- gladeXML = Glade.XML.FromAssembly (Util.GetGladePath() + "chronojump.glade", "error_window",
"chronojump");
+ gladeXML = Glade.XML.FromAssembly (Util.GetGladePath() + "error_window.glade",
"error_window", "chronojump");
gladeXML.Autoconnect(this);
//put an icon to window
diff --git a/src/gui/evaluator.cs b/src/gui/evaluator.cs
index 5d9b82d..9bc24ee 100644
--- a/src/gui/evaluator.cs
+++ b/src/gui/evaluator.cs
@@ -98,7 +98,7 @@ public class EvaluatorWindow
{
//Setup (text, table, uniqueID);
Glade.XML gladeXML;
- gladeXML = Glade.XML.FromAssembly (Util.GetGladePath() + "chronojump.glade",
"evaluator_window", "chronojump");
+ gladeXML = Glade.XML.FromAssembly (Util.GetGladePath() + "evaluator_window.glade",
"evaluator_window", "chronojump");
gladeXML.Autoconnect(this);
//put an icon to window
diff --git a/src/gui/event.cs b/src/gui/event.cs
index bf15db5..3e15e36 100644
--- a/src/gui/event.cs
+++ b/src/gui/event.cs
@@ -130,7 +130,7 @@ public class EditEventWindow
EditEventWindow (Gtk.Window parent) {
//Glade.XML gladeXML;
- //gladeXML = Glade.XML.FromAssembly (Util.GetGladePath() + "chronojump.glade", "edit_event",
null);
+ //gladeXML = Glade.XML.FromAssembly (Util.GetGladePath() + "edit_event.glade", "edit_event",
null);
//gladeXML.Autoconnect(this);
this.parent = parent;
}
@@ -613,7 +613,7 @@ public class EventMoreWindow
public EventMoreWindow (Gtk.Window parent, bool testOrDelete) {
/*
Glade.XML gladeXML;
- gladeXML = Glade.XML.FromAssembly (Util.GetGladePath() + "chronojump.glade",
"jumps_runs_more", "chronojump");
+ gladeXML = Glade.XML.FromAssembly (Util.GetGladePath() + "jumps_runs_more.glade",
"jumps_runs_more", "chronojump");
gladeXML.Autoconnect(this);
*/
diff --git a/src/gui/eventGraphConfigure.cs b/src/gui/eventGraphConfigure.cs
index 8a3e4a0..8c33ef1 100644
--- a/src/gui/eventGraphConfigure.cs
+++ b/src/gui/eventGraphConfigure.cs
@@ -52,7 +52,7 @@ public class EventGraphConfigureWindow
EventGraphConfigureWindow () {
Glade.XML gladeXML;
- gladeXML = Glade.XML.FromAssembly (Util.GetGladePath() + "chronojump.glade",
"event_graph_configure", "chronojump");
+ gladeXML = Glade.XML.FromAssembly (Util.GetGladePath() + "event_graph_configure.glade",
"event_graph_configure", "chronojump");
gladeXML.Autoconnect(this);
//put an icon to window
diff --git a/src/gui/executeAuto.cs b/src/gui/executeAuto.cs
index 28478e5..d14fc5f 100644
--- a/src/gui/executeAuto.cs
+++ b/src/gui/executeAuto.cs
@@ -88,7 +88,7 @@ public class ExecuteAutoWindow
public ExecuteAutoWindow (Gtk.Window parent) {
Glade.XML gladeXML;
- gladeXML = Glade.XML.FromAssembly (Util.GetGladePath() + "chronojump.glade", "execute_auto",
null);
+ gladeXML = Glade.XML.FromAssembly (Util.GetGladePath() + "execute_auto.glade",
"execute_auto", null);
gladeXML.Autoconnect(this);
this.parent = parent;
diff --git a/src/gui/genericWindow.cs b/src/gui/genericWindow.cs
index e66ac3b..dcaae6e 100644
--- a/src/gui/genericWindow.cs
+++ b/src/gui/genericWindow.cs
@@ -121,7 +121,7 @@ public class GenericWindow
public GenericWindow (string textHeader)
{
Glade.XML gladeXML;
- gladeXML = Glade.XML.FromAssembly (Util.GetGladePath() + "chronojump.glade",
"generic_window", "chronojump");
+ gladeXML = Glade.XML.FromAssembly (Util.GetGladePath() + "generic_window.glade",
"generic_window", "chronojump");
gladeXML.Autoconnect(this);
//put an icon to window
diff --git a/src/gui/helpPorts.cs b/src/gui/helpPorts.cs
index 1569c7e..a6d7314 100644
--- a/src/gui/helpPorts.cs
+++ b/src/gui/helpPorts.cs
@@ -38,7 +38,7 @@ public class HelpPorts
public HelpPorts ()
{
Glade.XML gladeXML;
- gladeXML = Glade.XML.FromAssembly (Util.GetGladePath() + "chronojump.glade",
"dialog_help_ports", "chronojump");
+ gladeXML = Glade.XML.FromAssembly (Util.GetGladePath() + "dialog_help_ports.glade",
"dialog_help_ports", "chronojump");
gladeXML.Autoconnect(this);
//put an icon to window
diff --git a/src/gui/jump.cs b/src/gui/jump.cs
index 2dafa11..8a6e167 100644
--- a/src/gui/jump.cs
+++ b/src/gui/jump.cs
@@ -57,7 +57,7 @@ public class EditJumpWindow : EditEventWindow
public EditJumpWindow (Gtk.Window parent) {
Glade.XML gladeXML;
- gladeXML = Glade.XML.FromAssembly (Util.GetGladePath() + "chronojump.glade", "edit_event",
null);
+ gladeXML = Glade.XML.FromAssembly (Util.GetGladePath() + "edit_event.glade", "edit_event",
null);
gladeXML.Autoconnect(this);
this.parent = parent;
@@ -449,7 +449,7 @@ public class EditJumpRjWindow : EditJumpWindow
EditJumpRjWindow (Gtk.Window parent) {
Glade.XML gladeXML;
- gladeXML = Glade.XML.FromAssembly (Util.GetGladePath() + "chronojump.glade", "edit_event",
null);
+ gladeXML = Glade.XML.FromAssembly (Util.GetGladePath() + "edit_event.glade", "edit_event",
null);
gladeXML.Autoconnect(this);
this.parent = parent;
@@ -591,7 +591,7 @@ public class RepairJumpRjWindow
RepairJumpRjWindow (Gtk.Window parent, JumpRj myJump, int pDN) {
Glade.XML gladeXML;
- gladeXML = Glade.XML.FromAssembly (Util.GetGladePath() + "chronojump.glade",
"repair_sub_event", null);
+ gladeXML = Glade.XML.FromAssembly (Util.GetGladePath() + "repair_sub_event.glade",
"repair_sub_event", null);
gladeXML.Autoconnect(this);
//put an icon to window
@@ -1448,7 +1448,7 @@ public class JumpsMoreWindow : EventMoreWindow
public JumpsMoreWindow (Gtk.Window parent, bool testOrDelete) {
Glade.XML gladeXML;
- gladeXML = Glade.XML.FromAssembly (Util.GetGladePath() + "chronojump.glade",
"jumps_runs_more", null);
+ gladeXML = Glade.XML.FromAssembly (Util.GetGladePath() + "jumps_runs_more.glade",
"jumps_runs_more", null);
gladeXML.Autoconnect(this);
this.parent = parent;
this.testOrDelete = testOrDelete;
@@ -1660,7 +1660,7 @@ public class JumpsRjMoreWindow : EventMoreWindow
public JumpsRjMoreWindow (Gtk.Window parent, bool testOrDelete) {
//the glade window is the same as jumps_more
Glade.XML gladeXML;
- gladeXML = Glade.XML.FromAssembly (Util.GetGladePath() + "chronojump.glade",
"jumps_runs_more", "chronojump");
+ gladeXML = Glade.XML.FromAssembly (Util.GetGladePath() + "jumps_runs_more.glade",
"jumps_runs_more", "chronojump");
gladeXML.Autoconnect(this);
this.parent = parent;
this.testOrDelete = testOrDelete;
diff --git a/src/gui/jumpType.cs b/src/gui/jumpType.cs
index 07045d4..ac486f8 100644
--- a/src/gui/jumpType.cs
+++ b/src/gui/jumpType.cs
@@ -63,7 +63,7 @@ public class JumpTypeAddWindow
JumpTypeAddWindow (Gtk.Window parent, bool simple) {
Glade.XML gladeXML;
- gladeXML = Glade.XML.FromAssembly (Util.GetGladePath() + "chronojump.glade", "jump_type_add",
"chronojump");
+ gladeXML = Glade.XML.FromAssembly (Util.GetGladePath() + "jump_type_add.glade",
"jump_type_add", "chronojump");
gladeXML.Autoconnect(this);
this.parent = parent;
diff --git a/src/gui/multiChronopic.cs b/src/gui/multiChronopic.cs
index 1d60fd8..f610bb0 100644
--- a/src/gui/multiChronopic.cs
+++ b/src/gui/multiChronopic.cs
@@ -122,7 +122,7 @@ public class EditMultiChronopicWindow : EditEventWindow
EditMultiChronopicWindow (Gtk.Window parent) {
Glade.XML gladeXML;
- gladeXML = Glade.XML.FromAssembly (Util.GetGladePath() + "chronojump.glade", "edit_event",
"chronojump");
+ gladeXML = Glade.XML.FromAssembly (Util.GetGladePath() + "edit_event.glade", "edit_event",
"chronojump");
gladeXML.Autoconnect(this);
this.parent = parent;
diff --git a/src/gui/person.cs b/src/gui/person.cs
index 662b441..3b370a5 100644
--- a/src/gui/person.cs
+++ b/src/gui/person.cs
@@ -70,7 +70,7 @@ public class PersonRecuperateWindow {
PersonRecuperateWindow (Gtk.Window parent, Session currentSession) {
Glade.XML gladeXML;
- gladeXML = Glade.XML.FromAssembly (Util.GetGladePath() + "chronojump.glade",
"person_recuperate", null);
+ gladeXML = Glade.XML.FromAssembly (Util.GetGladePath() + "person_recuperate.glade",
"person_recuperate", null);
gladeXML.Autoconnect(this);
this.parent = parent;
@@ -313,7 +313,7 @@ public class PersonsRecuperateFromOtherSessionWindow : PersonRecuperateWindow
PersonsRecuperateFromOtherSessionWindow (Gtk.Window parent, Session currentSession) {
Glade.XML gladeXML;
- gladeXML = Glade.XML.FromAssembly (Util.GetGladePath() + "chronojump.glade",
"person_recuperate", null);
+ gladeXML = Glade.XML.FromAssembly (Util.GetGladePath() + "person_recuperate.glade",
"person_recuperate", null);
gladeXML.Autoconnect(this);
this.parent = parent;
@@ -646,7 +646,7 @@ public class PersonNotUploadWindow : PersonsRecuperateFromOtherSessionWindow
PersonNotUploadWindow (Gtk.Window parent, int sessionID) {
Glade.XML gladeXML;
- gladeXML = Glade.XML.FromAssembly (Util.GetGladePath() + "chronojump.glade",
"person_recuperate", null);
+ gladeXML = Glade.XML.FromAssembly (Util.GetGladePath() + "person_recuperate.glade",
"person_recuperate", null);
gladeXML.Autoconnect(this);
this.parent = parent;
@@ -876,7 +876,7 @@ public class PersonAddModifyWindow
//showPhotoStuff is false on raspberry to not use camera
PersonAddModifyWindow (Gtk.Window parent, Session currentSession, Person currentPerson, bool
showPhotoStuff) {
Glade.XML gladeXML;
- gladeXML = Glade.XML.FromAssembly (Util.GetGladePath() + "chronojump.glade", "person_win",
null);
+ gladeXML = Glade.XML.FromAssembly (Util.GetGladePath() + "person_win.glade", "person_win",
null);
gladeXML.Autoconnect(this);
//put an icon to window
@@ -1762,7 +1762,7 @@ public class PersonAddMultipleWindow {
PersonAddMultipleWindow (Gtk.Window parent, Session currentSession) {
Glade.XML gladeXML;
- gladeXML = Glade.XML.FromAssembly (Util.GetGladePath() + "chronojump.glade",
"person_multiple_infinite", null);
+ gladeXML = Glade.XML.FromAssembly (Util.GetGladePath() + "person_multiple_infinite.glade",
"person_multiple_infinite", null);
gladeXML.Autoconnect(this);
//put an icon to window
@@ -2305,7 +2305,7 @@ public class PersonShowAllEventsWindow {
PersonShowAllEventsWindow (Gtk.Window parent, int sessionID, Person currentPerson) {
Glade.XML gladeXML;
- gladeXML = Glade.XML.FromAssembly (Util.GetGladePath() + "chronojump.glade",
"person_show_all_events", "chronojump");
+ gladeXML = Glade.XML.FromAssembly (Util.GetGladePath() + "person_show_all_events.glade",
"person_show_all_events", "chronojump");
gladeXML.Autoconnect(this);
//put an icon to window
diff --git a/src/gui/personSelect.cs b/src/gui/personSelect.cs
index d6d2fa7..14fad96 100644
--- a/src/gui/personSelect.cs
+++ b/src/gui/personSelect.cs
@@ -49,7 +49,7 @@ public class PersonSelectWindow
PersonSelectWindow (Gtk.Window parent) {
Glade.XML gladeXML;
- gladeXML = Glade.XML.FromAssembly (Util.GetGladePath() + "chronojump.glade",
"person_select_window", "chronojump");
+ gladeXML = Glade.XML.FromAssembly (Util.GetGladePath() + "person_select_window.glade",
"person_select_window", "chronojump");
gladeXML.Autoconnect(this);
//put an icon to window
diff --git a/src/gui/preferences.cs b/src/gui/preferences.cs
index 941a29e..41bfac8 100644
--- a/src/gui/preferences.cs
+++ b/src/gui/preferences.cs
@@ -154,7 +154,7 @@ public class PreferencesWindow {
PreferencesWindow () {
Glade.XML gladeXML;
- gladeXML = Glade.XML.FromAssembly (Util.GetGladePath() + "chronojump.glade",
"preferences_win", "chronojump");
+ gladeXML = Glade.XML.FromAssembly (Util.GetGladePath() + "preferences_win.glade",
"preferences_win", "chronojump");
gladeXML.Autoconnect(this);
//put an icon to window
diff --git a/src/gui/pulse.cs b/src/gui/pulse.cs
index 4446d07..aeed68f 100644
--- a/src/gui/pulse.cs
+++ b/src/gui/pulse.cs
@@ -39,7 +39,7 @@ public class EditPulseWindow : EditEventWindow
EditPulseWindow (Gtk.Window parent) {
Glade.XML gladeXML;
- gladeXML = Glade.XML.FromAssembly (Util.GetGladePath() + "chronojump.glade", "edit_event",
null);
+ gladeXML = Glade.XML.FromAssembly (Util.GetGladePath() + "edit_event.glade", "edit_event",
null);
gladeXML.Autoconnect(this);
this.parent = parent;
@@ -214,7 +214,7 @@ public class RepairPulseWindow
RepairPulseWindow (Gtk.Window parent, Pulse myPulse, int pDN) {
Glade.XML gladeXML;
- gladeXML = Glade.XML.FromAssembly (Util.GetGladePath() + "chronojump.glade",
"repair_sub_event", "chronojump");
+ gladeXML = Glade.XML.FromAssembly (Util.GetGladePath() + "repair_sub_event.glade",
"repair_sub_event", "chronojump");
gladeXML.Autoconnect(this);
//put an icon to window
diff --git a/src/gui/queryServer.cs b/src/gui/queryServer.cs
index 7f9b932..1109826 100644
--- a/src/gui/queryServer.cs
+++ b/src/gui/queryServer.cs
@@ -163,7 +163,7 @@ public class QueryServerWindow
public QueryServerWindow (int newPrefsDigitsNumber, string [] evaluators)
{
Glade.XML gladeXML;
- gladeXML = Glade.XML.FromAssembly (Util.GetGladePath() + "chronojump.glade",
"query_server_window", "chronojump");
+ gladeXML = Glade.XML.FromAssembly (Util.GetGladePath() + "query_server_window.glade",
"query_server_window", "chronojump");
gladeXML.Autoconnect(this);
this.pDN = newPrefsDigitsNumber;
diff --git a/src/gui/reactionTime.cs b/src/gui/reactionTime.cs
index eaf8cce..ebbf09d 100644
--- a/src/gui/reactionTime.cs
+++ b/src/gui/reactionTime.cs
@@ -324,7 +324,7 @@ public class EditReactionTimeWindow : EditEventWindow
EditReactionTimeWindow (Gtk.Window parent) {
Glade.XML gladeXML;
- gladeXML = Glade.XML.FromAssembly (Util.GetGladePath() + "chronojump.glade", "edit_event",
"chronojump");
+ gladeXML = Glade.XML.FromAssembly (Util.GetGladePath() + "edit_event.glade", "edit_event",
"chronojump");
gladeXML.Autoconnect(this);
this.parent = parent;
diff --git a/src/gui/repetitiveConditions.cs b/src/gui/repetitiveConditions.cs
index c06a86f..02f327d 100644
--- a/src/gui/repetitiveConditions.cs
+++ b/src/gui/repetitiveConditions.cs
@@ -161,7 +161,7 @@ public class RepetitiveConditionsWindow
RepetitiveConditionsWindow () {
Glade.XML gladeXML;
- gladeXML = Glade.XML.FromAssembly (Util.GetGladePath() + "chronojump.glade",
"repetitive_conditions", "chronojump");
+ gladeXML = Glade.XML.FromAssembly (Util.GetGladePath() + "repetitive_conditions.glade",
"repetitive_conditions", "chronojump");
gladeXML.Autoconnect(this);
//don't show until View is called
diff --git a/src/gui/report.cs b/src/gui/report.cs
index 9455f46..cc1cc6b 100644
--- a/src/gui/report.cs
+++ b/src/gui/report.cs
@@ -68,7 +68,7 @@ public class ReportWindow {
ReportWindow (Gtk.Window parent, Report report ) {
Glade.XML gladeXML;
- gladeXML = Glade.XML.FromAssembly (Util.GetGladePath() + "chronojump.glade", "report_window",
"chronojump");
+ gladeXML = Glade.XML.FromAssembly (Util.GetGladePath() + "report_window.glade",
"report_window", "chronojump");
gladeXML.Autoconnect(this);
this.parent = parent;
diff --git a/src/gui/run.cs b/src/gui/run.cs
index 76edb72..7e00d3c 100644
--- a/src/gui/run.cs
+++ b/src/gui/run.cs
@@ -42,7 +42,7 @@ public class EditRunWindow : EditEventWindow
public EditRunWindow (Gtk.Window parent) {
Glade.XML gladeXML;
- gladeXML = Glade.XML.FromAssembly (Util.GetGladePath() + "chronojump.glade", "edit_event",
null);
+ gladeXML = Glade.XML.FromAssembly (Util.GetGladePath() + "edit_event.glade", "edit_event",
null);
gladeXML.Autoconnect(this);
this.parent = parent;
@@ -252,7 +252,7 @@ public class EditRunIntervalWindow : EditRunWindow
EditRunIntervalWindow (Gtk.Window parent) {
Glade.XML gladeXML;
- gladeXML = Glade.XML.FromAssembly (Util.GetGladePath() + "chronojump.glade", "edit_event",
null);
+ gladeXML = Glade.XML.FromAssembly (Util.GetGladePath() + "edit_event.glade", "edit_event",
null);
gladeXML.Autoconnect(this);
this.parent = parent;
@@ -583,7 +583,7 @@ public class RepairRunIntervalWindow
RepairRunIntervalWindow (Gtk.Window parent, RunInterval myRun, int pDN) {
Glade.XML gladeXML;
- gladeXML = Glade.XML.FromAssembly (Util.GetGladePath() + "chronojump.glade",
"repair_sub_event", null);
+ gladeXML = Glade.XML.FromAssembly (Util.GetGladePath() + "repair_sub_event.glade",
"repair_sub_event", null);
gladeXML.Autoconnect(this);
this.parent = parent;
@@ -1149,7 +1149,7 @@ public class RunsMoreWindow : EventMoreWindow
RunsMoreWindow (Gtk.Window parent, bool testOrDelete) {
Glade.XML gladeXML;
- gladeXML = Glade.XML.FromAssembly (Util.GetGladePath() + "chronojump.glade",
"jumps_runs_more", null);
+ gladeXML = Glade.XML.FromAssembly (Util.GetGladePath() + "jumps_runs_more.glade",
"jumps_runs_more", null);
gladeXML.Autoconnect(this);
this.parent = parent;
this.testOrDelete = testOrDelete;
@@ -1336,7 +1336,7 @@ public class RunsIntervalMoreWindow : EventMoreWindow
RunsIntervalMoreWindow (Gtk.Window parent, bool testOrDelete) {
//the glade window is the same as jumps_more
Glade.XML gladeXML;
- gladeXML = Glade.XML.FromAssembly (Util.GetGladePath() + "chronojump.glade",
"jumps_runs_more", "chronojump");
+ gladeXML = Glade.XML.FromAssembly (Util.GetGladePath() + "jumps_runs_more.glade",
"jumps_runs_more", "chronojump");
gladeXML.Autoconnect(this);
this.parent = parent;
this.testOrDelete = testOrDelete;
diff --git a/src/gui/runType.cs b/src/gui/runType.cs
index 25cb137..72381c8 100644
--- a/src/gui/runType.cs
+++ b/src/gui/runType.cs
@@ -85,7 +85,7 @@ public class RunTypeAddWindow
RunTypeAddWindow (Gtk.Window parent, bool simple) {
Glade.XML gladeXML;
- gladeXML = Glade.XML.FromAssembly (Util.GetGladePath() + "chronojump.glade", "run_type_add",
"chronojump");
+ gladeXML = Glade.XML.FromAssembly (Util.GetGladePath() + "run_type_add.glade",
"run_type_add", "chronojump");
gladeXML.Autoconnect(this);
this.parent = parent;
diff --git a/src/gui/server.cs b/src/gui/server.cs
index e75b496..ed0f820 100644
--- a/src/gui/server.cs
+++ b/src/gui/server.cs
@@ -106,7 +106,7 @@ public class SessionUploadWindow {
SessionUploadWindow (Gtk.Window parent) {
Glade.XML gladeXML;
- gladeXML = Glade.XML.FromAssembly (Util.GetGladePath() + "chronojump.glade",
"session_upload", "chronojump");
+ gladeXML = Glade.XML.FromAssembly (Util.GetGladePath() + "session_upload.glade",
"session_upload", "chronojump");
gladeXML.Autoconnect(this);
this.parent = parent;
diff --git a/src/gui/session.cs b/src/gui/session.cs
index aea3ba9..db49431 100644
--- a/src/gui/session.cs
+++ b/src/gui/session.cs
@@ -80,7 +80,7 @@ public class SessionAddEditWindow {
SessionAddEditWindow (Gtk.Window parent, Session currentSession) {
Glade.XML gladeXML;
- gladeXML = Glade.XML.FromAssembly (Util.GetGladePath() + "chronojump.glade",
"session_add_edit", null);
+ gladeXML = Glade.XML.FromAssembly (Util.GetGladePath() + "session_add_edit.glade",
"session_add_edit", null);
gladeXML.Autoconnect(this);
this.parent = parent;
@@ -1031,7 +1031,7 @@ public class SessionSelectStatsWindow {
SessionSelectStatsWindow (Gtk.Window parent, ArrayList oldSelectedSessions) {
Glade.XML gladeXML;
- gladeXML = Glade.XML.FromAssembly (Util.GetGladePath() + "chronojump.glade",
"stats_select_sessions", "chronojump");
+ gladeXML = Glade.XML.FromAssembly (Util.GetGladePath() + "stats_select_sessions.glade",
"stats_select_sessions", "chronojump");
gladeXML.Autoconnect(this);
this.parent = parent;
diff --git a/src/gui/splash.cs b/src/gui/splash.cs
index 9c19fb0..b0298aa 100644
--- a/src/gui/splash.cs
+++ b/src/gui/splash.cs
@@ -42,7 +42,7 @@ public class SplashWindow
public SplashWindow ()
{
Glade.XML gladeXML;
- gladeXML = Glade.XML.FromAssembly (Util.GetGladePath() + "chronojump.glade", "splash_window",
"chronojump");
+ gladeXML = Glade.XML.FromAssembly (Util.GetGladePath() + "splash_window.glade",
"splash_window", "chronojump");
gladeXML.Autoconnect(this);
//put an icon to window
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
