GNOME.org
 

gnome-mud r763 - in trunk: . plugins plugins/automapper po src ui

Author: lharris
Date: Fri Feb 27 14:24:55 2009
New Revision: 763
URL: http://svn.gnome.org/viewvc/gnome-mud?rev=763&view=rev

Log:
Removed automapper, pruned schema, ui fix.


Removed:
   trunk/plugins/automapper/
   trunk/ui/connect.glade
Modified:
   trunk/ChangeLog
   trunk/gnome-mud.schemas.in
   trunk/plugins/Makefile.am
   trunk/po/ChangeLog
   trunk/po/POTFILES.in
   trunk/src/gconf-helper.c
   trunk/src/mud-profile.c
   trunk/src/mud-window.c
   trunk/ui/Makefile.am
   trunk/ui/main.glade
   trunk/ui/muds.glade

Modified: trunk/gnome-mud.schemas.in
==============================================================================
--- trunk/gnome-mud.schemas.in	(original)
+++ trunk/gnome-mud.schemas.in	Fri Feb 27 14:24:55 2009
@@ -67,22 +67,6 @@
 		</schema>
 
 		<schema>
-			<key>/schemas/apps/gnome-mud/ui/tab_location</key>
-			<applyto>/apps/gnome-mud/ui/tab_location</applyto>
-			<owner>gnome-mud</owner>
-			<type>string</type>
-			<default>bottom</default>
-			<locale name="C">
-				<short>Tab location</short>
-				<long>
-				 The location of the connection tabs. Valid
-				 options are "left", "right", "top" and
-				 "bottom".
-				</long>
-			</locale>
-		</schema>
-
-		<schema>
 			<key>/schemas/apps/gnome-mud/ui/scrollback_lines</key>
 			<applyto>/apps/gnome-mud/ui/scrollback_lines</applyto>
 			<owner>gnome-mud</owner>
@@ -265,38 +249,6 @@
 		</schema>
 
 		<schema>
-			<key>/schemas/apps/gnome-mud/functionality/terminal_type</key>
-			<applyto>/apps/gnome-mud/functionality/terminal_type</applyto>
-			<owner>gnome-mud</owner>
-			<type>string</type>
-			<default>xterm</default>
-			<locale name="C">
-				<short>Terminal type</short>
-				<long>
-				 GNOME-Mud will attempt to transmit a terminal
-				 type (like ANSI or VT100) if the MUD requests
-				 one. This option sets the terminal type that
-				 will be sent.
-				</long>
-			</locale>
-		</schema>
-
-		<schema>
-			<key>/schemas/apps/gnome-mud/functionality/mudlist_file</key>
-			<applyto>/apps/gnome-mud/functionality/mudlist_file</applyto>
-			<owner>gnome-mud</owner>
-			<type>string</type>
-			<default></default>
-			<locale name="C">
-				<short>Mudlist file</short>
-				<long>
-				 File where the mud list (used in the
-				 MudList dialog) will be read
-				</long>
-			</locale>
-		</schema>
-
-		<schema>
 			<key>/schemas/apps/gnome-mud/functionality/scroll_on_output</key>
 			<applyto>/apps/gnome-mud/functionality/scroll_on_output</applyto>
 			<owner>gnome-mud</owner>
@@ -312,21 +264,6 @@
 		</schema>
 
 		<schema>
-			<key>/schemas/apps/gnome-mud/functionality/history_count</key>
-			<applyto>/apps/gnome-mud/functionality/history_count</applyto>
-			<owner>gnome-mud</owner>
-			<type>int</type>
-			<default>10</default>
-			<locale name="C">
-				<short>How many entries to keep in the command history</short>
-				<long>
-				 How many entries to keep in the command
-				 history.
-				</long>
-			</locale>
-		</schema>
-
-		<schema>
 			<key>/schemas/apps/gnome-mud/functionality/last_log_dir</key>
 			<applyto>/apps/gnome-mud/functionality/last_log_dir</applyto>
 			<owner>gnome-mud</owner>
@@ -356,23 +293,6 @@
 		</schema>
 
 		<schema>
-			<key>/schemas/apps/gnome-mud/muds/list</key>
-			<applyto>/apps/gnome-mud/muds/list</applyto>
-			<owner>gnome-mud</owner>
-			<type>list</type>
-			<list_type>string</list_type>
-			<default>[]</default>
-			<locale name="C">
-				<short>List of Muds</short>
-				<long>
-				List of MUDs known to GNOME-Mud. The
-				list contains strings naming subdirectories
-				relative to /apps/gnome-mud/muds
-				</long>
-			</locale>
-		</schema>
-		
-		<schema>
 			<key>/schemas/apps/gnome-mud/profiles/list</key>
 			<applyto>/apps/gnome-mud/profiles/list</applyto>
 			<owner>gnome-mud</owner>
@@ -389,39 +309,6 @@
 			</locale>
 		</schema>
 
-		<schema>
-			<key>/schemas/apps/gnome-mud/connections/list</key>
-			<applyto>/apps/gnome-mud/connections/list</applyto>
-			<owner>gnome-mud</owner>
-			<type>list</type>
-			<list_type>string</list_type>
-			<default>[]</default>
-			<locale name="C">
-				<short>List of connections</short>
-				<long>
-				 List of connections known to GNOME-Mud. The
-				 list contains strings naming subdirectories
-				 relative to /apps/gnome-mud/connections.
-				</long>
-			</locale>
-		</schema>
-
-		<schema>
-			<key>/schemas/apps/gnome-mud/mapper/unusual_exits</key>
-			<applyto>/apps/gnome-mud/mapper/unusual_exits</applyto>
-			<owner>gnome-mud</owner>
-			<type>string</type>
-			<default>path;in;out;town;farm;gates;gate;cave;valley;ruins;enter;hole;cottage</default>
-			<locale name="C">
-				<short>List of movement commands</short>
-				<long>
-				 List of commands which will be treated as
-				 movement commands by the automapper. A
-				 semicolon is used to separate each command.
-				</long>
-			</locale>
-		</schema>
-
 		<!-- Profile specific -->
 		<schema>
 			<key>/schemas/apps/gnome-mud/profiles/Default/aliases</key>
@@ -477,7 +364,7 @@
 			<owner>gnome-mud</owner>
 			<type>list</type>
 			<list_type>string</list_type>
-			<default>[n,nw,e,se,s,sw,w,nw,u,d,look]</default>
+			<default>[n,nw,e,se,s,sw,w,ne,u,d,look]</default>
 			<locale name="C">
 				<short>Directional keybindings</short>
 			</locale>

Modified: trunk/plugins/Makefile.am
==============================================================================
--- trunk/plugins/Makefile.am	(original)
+++ trunk/plugins/Makefile.am	Fri Feb 27 14:24:55 2009
@@ -1,11 +1,6 @@
 EXTRA_DIST = \
 	test.plugin/Makefile \
 	test.plugin/main.c \
-	automapper/Makefile \
-	automapper/map.c \
-	automapper/map.h \
-	automapper/map-link.c \
-	automapper/directions.h \
 	outputwindows/Makefile \
 	outputwindows/main.c \
 	statusbars/Makefile \

Modified: trunk/po/POTFILES.in
==============================================================================
--- trunk/po/POTFILES.in	(original)
+++ trunk/po/POTFILES.in	Fri Feb 27 14:24:55 2009
@@ -13,10 +13,7 @@
 src/mud-tray.c
 src/mud-preferences-window.c
 src/mud-window.c
-ui/connect.glade
 ui/directions.glade
 ui/main.glade
 ui/muds.glade
 ui/prefs.glade
-
-plugins/automapper/map.c

Modified: trunk/src/gconf-helper.c
==============================================================================
--- trunk/src/gconf-helper.c	(original)
+++ trunk/src/gconf-helper.c	Fri Feb 27 14:24:55 2009
@@ -111,15 +111,12 @@
     GCONF_GET_COLOR(foreground_color,	ui,				Foreground);
     GCONF_GET_COLOR(background_color,	ui,				Background);
     GCONF_GET_INT(scrollback_lines,		ui,				Scrollback);
-    GCONF_GET_STRING(tab_location,		ui,				TabLocation);
     GCONF_GET_STRING(commdev, 			functionality,	CommDev);
     GCONF_GET_BOOLEAN(echo,     		functionality,	EchoText);
     GCONF_GET_BOOLEAN(keeptext,			functionality,	KeepText);
     GCONF_GET_BOOLEAN(system_keys,		functionality,	DisableKeys);
-    GCONF_GET_STRING(terminal_type,		functionality,	TerminalType);
     GCONF_GET_STRING(mudlist_file,		functionality,	MudListFile);
     GCONF_GET_BOOLEAN(scroll_on_output,	functionality,	ScrollOnOutput);
-    GCONF_GET_INT(history_count,		functionality,	History);
     GCONF_GET_INT(flush_interval,		functionality,	FlushInterval);
     GCONF_GET_STRING(encoding,          functionality,  Encoding);
     GCONF_GET_STRING(proxy_version,     functionality,  ProxyVersion);

Modified: trunk/src/mud-profile.c
==============================================================================
--- trunk/src/mud-profile.c	(original)
+++ trunk/src/mud-profile.c	Fri Feb 27 14:24:55 2009
@@ -146,9 +146,8 @@
     profile = MUD_PROFILE(object);
 
     g_free(profile->priv->preferences.FontName);
-    g_free(profile->priv->preferences.TabLocation);
     g_free(profile->priv->preferences.CommDev);
-    g_free(profile->priv->preferences.TerminalType);
+   // g_free(profile->priv->preferences.TerminalType);
     g_free(profile->priv->preferences.MudListFile);
     g_free(profile->priv->preferences.LastLogDir);
 
@@ -318,8 +317,6 @@
     mud_profile_set_disablekeys(to, from->preferences->DisableKeys);
     mud_profile_set_scrolloutput(to, from->preferences->ScrollOnOutput);
     mud_profile_set_commdev(to, from->preferences->CommDev);
-    mud_profile_set_terminal(to, from->preferences->TerminalType);
-    mud_profile_set_history(to, from->preferences->History);
     mud_profile_set_scrollback(to, from->preferences->Scrollback);
     mud_profile_set_font(to, from->preferences->FontName);
     mud_profile_set_foreground(to, from->preferences->Foreground.red,
@@ -563,15 +560,6 @@
             profile->priv->preferences.UseRemoteDownload = bool_setting;
         }
     }
-    else if(strcmp(key, "history_count") == 0)
-    {
-        int_setting = 10;
-
-        if(val && val->type == GCONF_VALUE_INT)
-            int_setting = gconf_value_get_int(val);
-
-        mask.History = set_History(profile, int_setting);
-    }
     else if(strcmp(key, "scrollback_lines") == 0)
     {
         int_setting = 500;
@@ -590,15 +578,6 @@
 
         mask.CommDev = set_CommDev(profile, string_setting);
     }
-    else if(strcmp(key, "terminal_type") == 0)
-    {
-        string_setting = "gnome-mud";
-
-        if(val && val->type == GCONF_VALUE_STRING)
-            string_setting = gconf_value_get_string(val);
-
-        mask.TerminalType = set_TerminalType(profile, string_setting);
-    }
     else if(strcmp(key, "font") == 0)
     {
         string_setting = "monospace 12";

Modified: trunk/src/mud-window.c
==============================================================================
--- trunk/src/mud-window.c	(original)
+++ trunk/src/mud-window.c	Fri Feb 27 14:24:55 2009
@@ -538,56 +538,6 @@
     return FALSE;
 }
 
-static void
-mud_window_connect_dialog(GtkWidget *widget, MudWindow *window)
-{
-    GladeXML *glade;
-    GtkWidget *dialog;
-    GtkWidget *entry_host;
-    GtkWidget *entry_port;
-    gint result;
-
-    glade = glade_xml_new(GLADEDIR "/connect.glade", "connect_window", NULL);
-    dialog = glade_xml_get_widget(glade, "connect_window");
-
-    entry_host = glade_xml_get_widget(glade, "entry_host");
-    entry_port = glade_xml_get_widget(glade, "entry_post");
-    gtk_entry_set_text(GTK_ENTRY(entry_host), window->priv->host);
-    gtk_entry_set_text(GTK_ENTRY(entry_port), window->priv->port);
-
-    result = gtk_dialog_run(GTK_DIALOG(dialog));
-    if (result == GTK_RESPONSE_OK)
-    {
-        MudConnectionView *view;
-        const gchar *host, *port;
-        gint iport;
-
-        g_free(window->priv->host);
-        host = gtk_entry_get_text(GTK_ENTRY(entry_host));
-        window->priv->host = g_strdup(host);
-
-        g_free(window->priv->port);
-        port = gtk_entry_get_text(GTK_ENTRY(entry_port));
-        window->priv->port = g_strdup(port);
-        iport = atoi(port);
-
-        if (iport < 1)
-        {
-            iport = 23;
-        }
-
-        mud_tray_update_icon(window->priv->tray, offline);
-
-        view = mud_connection_view_new("Default", host, iport, window->priv->window, (GtkWidget *)window->priv->tray, g_strdup(host));
-        mud_window_add_connection_view(window, view, g_strdup(host));
-
-
-    }
-
-    gtk_widget_destroy(dialog);
-    g_object_unref(glade);
-}
-
 gboolean
 save_dialog_vte_cb (VteTerminal *terminal,glong column,glong row,gpointer data)
 {
@@ -807,7 +757,6 @@
 
     /* connect connect buttons */
     g_signal_connect(glade_xml_get_widget(glade, "main_connect"), "activate", G_CALLBACK(mud_window_mconnect_dialog), window);
-    g_signal_connect(glade_xml_get_widget(glade, "menu_connect"), "activate", G_CALLBACK(mud_window_connect_dialog), window);
     g_signal_connect(glade_xml_get_widget(glade, "toolbar_connect"), "clicked", G_CALLBACK(mud_window_mconnect_dialog), window);
 
     /* connect disconnect buttons */

Modified: trunk/ui/Makefile.am
==============================================================================
--- trunk/ui/Makefile.am	(original)
+++ trunk/ui/Makefile.am	Fri Feb 27 14:24:55 2009
@@ -1,6 +1,5 @@
 gladedir = $(pkgdatadir)
 glade_DATA = \
-	connect.glade		\
 	directions.glade	\
 	main.glade		\
 	muds.glade		\

Modified: trunk/ui/main.glade
==============================================================================
--- trunk/ui/main.glade	(original)
+++ trunk/ui/main.glade	Fri Feb 27 14:24:55 2009
@@ -42,21 +42,6 @@
                       </widget>
                     </child>
                     <child>
-                      <widget class="GtkImageMenuItem" id="menu_connect">
-                        <property name="label" translatable="yes">Q_uick Connect...</property>
-                        <property name="visible">True</property>
-                        <property name="use_underline">True</property>
-                        <property name="use_stock">False</property>
-                        <child internal-child="image">
-                          <widget class="GtkImage" id="image3">
-                            <property name="visible">True</property>
-                            <property name="stock">gtk-new</property>
-                            <property name="icon-size">1</property>
-                          </widget>
-                        </child>
-                      </widget>
-                    </child>
-                    <child>
                       <widget class="GtkImageMenuItem" id="menu_disconnect">
                         <property name="label" translatable="yes">_Disconnect</property>
                         <property name="visible">True</property>

Modified: trunk/ui/muds.glade
==============================================================================
--- trunk/ui/muds.glade	(original)
+++ trunk/ui/muds.glade	Fri Feb 27 14:24:55 2009
@@ -170,6 +170,7 @@
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">False</property>
+                    <property name="padding">5</property>
                     <property name="position">4</property>
                   </packing>
                 </child>
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]