summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefano Karapetsas <[email protected]>2012-05-23 17:14:21 +0200
committerStefano Karapetsas <[email protected]>2012-05-23 17:14:21 +0200
commit8b37f5bb6c8bd04dcde7edd66a366ba5c1eb3834 (patch)
treed4219a120fb5e53d5085860a49f855e493b36819
parent9af851f0c4f0296eb5654233b9fc251e9377c8b9 (diff)
downloadmate-panel-8b37f5bb6c8bd04dcde7edd66a366ba5c1eb3834.tar.bz2
mate-panel-8b37f5bb6c8bd04dcde7edd66a366ba5c1eb3834.tar.xz
fix some things for MATE in wncklet applet
-rw-r--r--applets/wncklet/showdesktop.c8
-rw-r--r--applets/wncklet/window-list.c17
-rw-r--r--applets/wncklet/window-list.schemas.in8
-rw-r--r--applets/wncklet/window-list.ui130
-rw-r--r--applets/wncklet/window-menu.c8
-rw-r--r--applets/wncklet/workspace-switcher.c10
6 files changed, 30 insertions, 151 deletions
diff --git a/applets/wncklet/showdesktop.c b/applets/wncklet/showdesktop.c
index 7cfcb88d..2917e4bc 100644
--- a/applets/wncklet/showdesktop.c
+++ b/applets/wncklet/showdesktop.c
@@ -463,17 +463,21 @@ static void display_help_dialog(GtkAction* action, ShowDesktopData* sdd)
static void display_about_dialog(GtkAction* action, ShowDesktopData* sdd)
{
static const gchar* authors[] = {
+ "Perberos <[email protected]>",
+ "Steve Zesch <[email protected]>",
+ "Stefano Karapetsas <[email protected]>",
"Havoc Pennington <[email protected]>",
NULL
};
static const char* documenters[] = {
- "Sun MATE Documentation Team <[email protected]>",
+ "Sun GNOME Documentation Team <[email protected]>",
NULL
};
/* Translator credits */
//const char* translator_credits = _("translator-credits");
char copyright[] = \
+ "Copyright \xc2\xa9 2011 Perberos\n"
"Copyright \xc2\xa9 2002 Red Hat, Inc.";
gtk_show_about_dialog(GTK_WINDOW(sdd->applet),
@@ -486,7 +490,7 @@ static void display_about_dialog(GtkAction* action, ShowDesktopData* sdd)
"logo-icon-name", SHOW_DESKTOP_ICON,
"translator-credits", _("translator-credits"),
"version", VERSION,
- "website", "http://matsusoft.com.ar/projects/mate/",
+ "website", "http://www.mate-desktop.org/",
NULL);
}
diff --git a/applets/wncklet/window-list.c b/applets/wncklet/window-list.c
index a7ed6197..b7056a8e 100644
--- a/applets/wncklet/window-list.c
+++ b/applets/wncklet/window-list.c
@@ -53,13 +53,6 @@ typedef struct {
GtkWidget* move_minimized_radio;
GtkWidget* change_workspace_radio;
- /* new options, must be translated! */
- /*GtkWidget* style_group_radio;
- GtkWidget* icon_group_radio;
- GtkWidget* text_group_radio;*/
-
-
-
/* mateconf listeners id */
guint listeners [3];
} TasklistData;
@@ -622,17 +615,21 @@ static void display_help_dialog(GtkAction* action, TasklistData* tasklist)
static void display_about_dialog(GtkAction* action, TasklistData* tasklist)
{
static const gchar* authors[] = {
+ "Perberos <[email protected]>",
+ "Steve Zesch <[email protected]>",
+ "Stefano Karapetsas <[email protected]>",
"Alexander Larsson <[email protected]>",
NULL
};
const char* documenters [] = {
- "Sun MATE Documentation Team <[email protected]>",
+ "Sun GNOME Documentation Team <[email protected]>",
NULL
};
char copyright[] = \
- "Copyright \xc2\xa9 2001-2002 Red Hat, Inc.";
+ "Copyright \xc2\xa9 2011 Perberos\n"
+ "Copyright \xc2\xa9 2002 Red Hat, Inc.";
gtk_show_about_dialog(GTK_WINDOW(tasklist->applet),
"program-name", _("Window List"),
@@ -644,7 +641,7 @@ static void display_about_dialog(GtkAction* action, TasklistData* tasklist)
"logo-icon-name", WINDOW_LIST_ICON,
"translator-credits", _("translator-credits"),
"version", VERSION,
- "website", "http://matsusoft.com.ar/projects/mate/",
+ "website", "http://www.mate-desktop.org/",
NULL);
}
diff --git a/applets/wncklet/window-list.schemas.in b/applets/wncklet/window-list.schemas.in
index b60c3222..99d79963 100644
--- a/applets/wncklet/window-list.schemas.in
+++ b/applets/wncklet/window-list.schemas.in
@@ -52,8 +52,8 @@
<locale name="C">
<short>Minimum window list size</short>
<long>
- The use of this key was deprecated in MATE 2.20. The schema is
- retained for compatibility with older versions.
+ The use of this key was deprecated in GNOME 2.20. The schema is
+ retained for compatibility with older versions.
</long>
</locale>
</schema>
@@ -66,8 +66,8 @@
<locale name="C">
<short>Maximum window list size</short>
<long>
- The use of this key was deprecated in MATE 2.20. The schema is
- retained for compatibility with older versions.
+ The use of this key was deprecated in GNOME 2.20. The schema is
+ retained for compatibility with older versions.
</long>
</locale>
</schema>
diff --git a/applets/wncklet/window-list.ui b/applets/wncklet/window-list.ui
index 9d6f4e71..21228d78 100644
--- a/applets/wncklet/window-list.ui
+++ b/applets/wncklet/window-list.ui
@@ -93,136 +93,6 @@
<property name="position">0</property>
</packing>
</child>
-
-
-
-
-
-
-
-
-
-<!-- agregado -- >
- <child>
- <object class="GtkVBox" id="vbox15">
- <property name="visible">True</property>
- <property name="orientation">vertical</property>
- <property name="spacing">6</property>
-
- <child>
-
- <object class="GtkLabel" id="label15">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Button list</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
- </object>
-
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
-
- </child>
-
- <child>
- <object class="GtkAlignment" id="alignment16">
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="left_padding">12</property>
-
- < ! -- lista de opciones -- >
- <child>
- <object class="GtkVBox" id="vbox16">
- <property name="visible">True</property>
- <property name="orientation">vertical</property>
- <property name="spacing">6</property>
-
- <child>
- <object class="GtkRadioButton" id="style_group_radio">
- <property name="label" translatable="yes">Show application icon and title</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
-
- <child>
- <object class="GtkRadioButton" id="icon_group_radio">
- <property name="label" translatable="yes">Show only application icon image</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- <property name="group">style_group_radio</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
-
- <child>
- <object class="GtkRadioButton" id="text_group_radio">
- <property name="label" translatable="yes">Show only application text title</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- <property name="group">style_group_radio</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">2</property>
- </packing>
- </child>
-
- </object>
- </child>
-
- </object>
-
- <packing>
- < !-- posicion dentro de la primer tabla vertical -- >
- <property name="position">1</property>
- </packing>
-
- </child>
-
- </object>
-
- <packing>
- <property name="expand">False</property>
- <property name="position">1</property>
- </packing>
-
- </child>
-
-< ! -- !agregado -->
-
-
-
-
-
-
-
-
-
-
<child>
<object class="GtkVBox" id="vbox11">
<property name="visible">True</property>
diff --git a/applets/wncklet/window-menu.c b/applets/wncklet/window-menu.c
index dabdb7e8..bfe41638 100644
--- a/applets/wncklet/window-menu.c
+++ b/applets/wncklet/window-menu.c
@@ -59,6 +59,9 @@ static void window_menu_help(GtkAction* action, WindowMenu* window_menu)
static void window_menu_about(GtkAction* action, WindowMenu* window_menu)
{
static const char* authors[] = {
+ "Perberos <[email protected]>",
+ "Steve Zesch <[email protected]>",
+ "Stefano Karapetsas <[email protected]>",
"Mark McLoughlin <[email protected]>",
"George Lebl <[email protected]>",
"Jacob Berkman <[email protected]>",
@@ -66,11 +69,12 @@ static void window_menu_about(GtkAction* action, WindowMenu* window_menu)
};
const char* documenters[] = {
- "Sun MATE Documentation Team <[email protected]>",
+ "Sun GNOME Documentation Team <[email protected]>",
NULL
};
char copyright[] = \
+ "Copyright \xc2\xa9 2011 Perberos\n"
"Copyright \xc2\xa9 2003 Sun Microsystems, Inc.\n"
"Copyright \xc2\xa9 2001 Free Software Foundation, Inc.\n"
"Copyright \xc2\xa9 2000 Helix Code, Inc.";
@@ -85,7 +89,7 @@ static void window_menu_about(GtkAction* action, WindowMenu* window_menu)
"logo-icon-name", WINDOW_MENU_ICON,
"translator-credits", _("translator-credits"),
"version", VERSION,
- "website", "http://matsusoft.com.ar/projects/mate/",
+ "website", "http://www.mate-desktop.org/",
NULL);
}
diff --git a/applets/wncklet/workspace-switcher.c b/applets/wncklet/workspace-switcher.c
index cd241bea..0e0641e5 100644
--- a/applets/wncklet/workspace-switcher.c
+++ b/applets/wncklet/workspace-switcher.c
@@ -559,18 +559,22 @@ static void display_help_dialog(GtkAction* action, PagerData* pager)
static void display_about_dialog(GtkAction* action, PagerData* pager)
{
static const gchar* authors[] = {
+ "Perberos <[email protected]>",
+ "Steve Zesch <[email protected]>",
+ "Stefano Karapetsas <[email protected]>",
"Alexander Larsson <[email protected]>",
NULL
};
const char* documenters[] = {
"John Fleck <[email protected]>",
- "Sun MATE Documentation Team <[email protected]>",
+ "Sun GNOME Documentation Team <[email protected]>",
NULL
};
char copyright[] = \
- "Copyright \xc2\xa9 2001-2002 Red Hat, Inc.";
+ "Copyright \xc2\xa9 2011 Perberos\n"
+ "Copyright \xc2\xa9 2002 Red Hat, Inc.";
gtk_show_about_dialog(GTK_WINDOW(pager->applet),
"program-name", _("Workspace Switcher"),
@@ -582,7 +586,7 @@ static void display_about_dialog(GtkAction* action, PagerData* pager)
"logo-icon-name", WORKSPACE_SWITCHER_ICON,
"translator-credits", _("translator-credits"),
"version", VERSION,
- "website", "http://matsusoft.com.ar/projects/mate/",
+ "website", "http://www.mate-desktop.org/",
NULL);
}