Commit a791af08 authored by Richard Hult's avatar Richard Hult Committed by Richard Hult

Break some really long lines. (window_populate): Add tooltip to the view

2004-08-06  Richard Hult  <richard@imendio.com>

	* src/planner-window.c: Break some really long lines.
	(window_populate): Add tooltip to the view radio items.

	* src/planner-ttable-view.c (ttable_view_ttable_status_updated):
	Set status message.
parent 837bf22b
2004-08-06 Richard Hult <richard@imendio.com> 2004-08-06 Richard Hult <richard@imendio.com>
* src/planner-window.c: Break some really long lines.
(window_populate): Add tooltip to the view radio items.
* src/planner-ttable-view.c (ttable_view_ttable_status_updated):
Set status message.
* src/Makefile.am: Fix libutil linkage. * src/Makefile.am: Fix libutil linkage.
* src/planner-gantt-view.c: (gantt_view_gantt_status_updated_cb): * src/planner-gantt-view.c: (gantt_view_gantt_status_updated_cb):
......
...@@ -11,7 +11,7 @@ msgid "" ...@@ -11,7 +11,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: planner\n" "Project-Id-Version: planner\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2004-08-06 19:51+0200\n" "POT-Creation-Date: 2004-08-06 20:15+0200\n"
"PO-Revision-Date: 2004-07-04 16:55+0200\n" "PO-Revision-Date: 2004-07-04 16:55+0200\n"
"Last-Translator: Christian Rose <menthos@menthos.com>\n" "Last-Translator: Christian Rose <menthos@menthos.com>\n"
"Language-Team: Swedish <sv@li.org>\n" "Language-Team: Swedish <sv@li.org>\n"
...@@ -806,7 +806,7 @@ msgid "Work" ...@@ -806,7 +806,7 @@ msgid "Work"
msgstr "Arbete" msgstr "Arbete"
#: src/planner-gantt-print.c:541 src/planner-gantt-row.c:685 #: src/planner-gantt-print.c:541 src/planner-gantt-row.c:685
#: src/planner-task-tree.c:1583 src/planner-window.c:1581 #: src/planner-task-tree.c:1583 src/planner-window.c:1635
msgid "Unnamed" msgid "Unnamed"
msgstr "Namnlös" msgstr "Namnlös"
...@@ -1031,7 +1031,7 @@ msgstr "" ...@@ -1031,7 +1031,7 @@ msgstr ""
"\"%s\" är en katalog.\n" "\"%s\" är en katalog.\n"
"Ange ett filnamn och försök igen." "Ange ett filnamn och försök igen."
#: src/planner-html-plugin.c:148 src/planner-window.c:1336 #: src/planner-html-plugin.c:148 src/planner-window.c:1390
#: src/planner-xml-planner-plugin.c:135 #: src/planner-xml-planner-plugin.c:135
#, c-format #, c-format
msgid "File \"%s\" exists, do you want to overwrite it?" msgid "File \"%s\" exists, do you want to overwrite it?"
...@@ -1709,159 +1709,164 @@ msgstr "Resurs_utnyttjande" ...@@ -1709,159 +1709,164 @@ msgstr "Resurs_utnyttjande"
msgid "Could not open view plugin file '%s'\n" msgid "Could not open view plugin file '%s'\n"
msgstr "Kunde inte öppna vyinsticksfilen \"%s\"\n" msgstr "Kunde inte öppna vyinsticksfilen \"%s\"\n"
#: src/planner-window.c:206 #: src/planner-window.c:207
msgid "_File" msgid "_File"
msgstr "_Arkiv" msgstr "_Arkiv"
#: src/planner-window.c:207 #: src/planner-window.c:211
msgid "_New Project" msgid "_New Project"
msgstr "_Nytt projekt" msgstr "_Nytt projekt"
#: src/planner-window.c:207 #: src/planner-window.c:211
msgid "Create a new project" msgid "Create a new project"
msgstr "Skapa ett nytt projekt" msgstr "Skapa ett nytt projekt"
#: src/planner-window.c:208 #: src/planner-window.c:215
msgid "_Open..." msgid "_Open..."
msgstr "_Öppna..." msgstr "_Öppna..."
#: src/planner-window.c:208 #: src/planner-window.c:215
msgid "Open a project" msgid "Open a project"
msgstr "Öppna ett projekt" msgstr "Öppna ett projekt"
#: src/planner-window.c:209 src/planner-window.c:1204 #: src/planner-window.c:218 src/planner-window.c:1258
msgid "_Save" msgid "_Save"
msgstr "_Spara" msgstr "_Spara"
#: src/planner-window.c:209 #: src/planner-window.c:218
msgid "Save the current project" msgid "Save the current project"
msgstr "Spara det aktuella projekt" msgstr "Spara det aktuella projekt"
#: src/planner-window.c:210 #: src/planner-window.c:221
msgid "_Export" msgid "_Export"
msgstr "_Exportera" msgstr "_Exportera"
#: src/planner-window.c:211 #: src/planner-window.c:224
msgid "Save _As..." msgid "Save _As..."
msgstr "Spara s_om..." msgstr "Spara s_om..."
#: src/planner-window.c:211 #: src/planner-window.c:224
msgid "Save the current project with a different name" msgid "Save the current project with a different name"
msgstr "Spara det aktuella projektet med ett annat namn" msgstr "Spara det aktuella projektet med ett annat namn"
#: src/planner-window.c:212 #: src/planner-window.c:227
msgid "_Print..." msgid "_Print..."
msgstr "S_kriv ut..." msgstr "S_kriv ut..."
#: src/planner-window.c:212 #: src/planner-window.c:227
msgid "Print the current project" msgid "Print the current project"
msgstr "Skriv ut aktuellt projekt" msgstr "Skriv ut aktuellt projekt"
#: src/planner-window.c:213 #: src/planner-window.c:230
msgid "Print Pre_view" msgid "Print Pre_view"
msgstr "_Förhandsgranskning" msgstr "_Förhandsgranskning"
#: src/planner-window.c:213 #: src/planner-window.c:230
msgid "Print preview of the current project" msgid "Print preview of the current project"
msgstr "Förhandsgranska aktuellt projekt" msgstr "Förhandsgranska aktuellt projekt"
#: src/planner-window.c:214 #: src/planner-window.c:233
msgid "_Close" msgid "_Close"
msgstr "S_täng" msgstr "S_täng"
#: src/planner-window.c:214 #: src/planner-window.c:233
msgid "Close the current file" msgid "Close the current file"
msgstr "Stäng aktuell fil" msgstr "Stäng aktuell fil"
#: src/planner-window.c:215 #: src/planner-window.c:236
msgid "_Quit" msgid "_Quit"
msgstr "_Avsluta" msgstr "_Avsluta"
#: src/planner-window.c:215 #: src/planner-window.c:236
msgid "Exit the program" msgid "Exit the program"
msgstr "Avsluta programmet" msgstr "Avsluta programmet"
#: src/planner-window.c:217 #: src/planner-window.c:240
msgid "_Edit" msgid "_Edit"
msgstr "_Redigera" msgstr "_Redigera"
#: src/planner-window.c:218 #: src/planner-window.c:243
msgid "_Undo" msgid "_Undo"
msgstr "_Ångra" msgstr "_Ångra"
#: src/planner-window.c:218 #: src/planner-window.c:243
msgid "Undo the last action" msgid "Undo the last action"
msgstr "Ångra den senaste åtgärden" msgstr "Ångra den senaste åtgärden"
#: src/planner-window.c:219 #: src/planner-window.c:246
msgid "_Redo" msgid "_Redo"
msgstr "_Gör om" msgstr "_Gör om"
#: src/planner-window.c:219 #: src/planner-window.c:246
msgid "Redo the undone action" msgid "Redo the undone action"
msgstr "Gör om den ångrade åtgärden" msgstr "Gör om den ångrade åtgärden"
#: src/planner-window.c:221 #: src/planner-window.c:250
msgid "_View" msgid "_View"
msgstr "_Visa" msgstr "_Visa"
#: src/planner-window.c:223 #: src/planner-window.c:254
msgid "_Actions" msgid "_Actions"
msgstr "_Åtgärder" msgstr "_Åtgärder"
#: src/planner-window.c:225 #: src/planner-window.c:258
msgid "_Project" msgid "_Project"
msgstr "_Projekt" msgstr "_Projekt"
#: src/planner-window.c:226 #: src/planner-window.c:261
msgid "_Manage Calendars" msgid "_Manage Calendars"
msgstr "_Hantera kalendrar" msgstr "_Hantera kalendrar"
#: src/planner-window.c:227 #: src/planner-window.c:264
msgid "Edit Day _Types" msgid "Edit Day _Types"
msgstr "Redigera dag_typer" msgstr "Redigera dag_typer"
#: src/planner-window.c:228 #: src/planner-window.c:267
msgid "Edit Project _Phases" msgid "Edit Project _Phases"
msgstr "Redigera projekt_faser" msgstr "Redigera projekt_faser"
#: src/planner-window.c:229 #: src/planner-window.c:270
msgid "_Edit Project Properties" msgid "_Edit Project Properties"
msgstr "_Redigera projektegenskaper" msgstr "_Redigera projektegenskaper"
#: src/planner-window.c:229 #: src/planner-window.c:270
msgid "Edit the project properties" msgid "Edit the project properties"
msgstr "Redigera projektegenskaperna" msgstr "Redigera projektegenskaperna"
#. { "PreferencesEditPreferences", NULL, NULL, NULL, NULL, G_CALLBACK (window_preferences_cb) }, #: src/planner-window.c:278
#: src/planner-window.c:233
msgid "_Help" msgid "_Help"
msgstr "_Hjälp" msgstr "_Hjälp"
#: src/planner-window.c:234 #: src/planner-window.c:281
msgid "_User Guide" msgid "_User Guide"
msgstr "_Användarmanual" msgstr "_Användarmanual"
#: src/planner-window.c:234 #: src/planner-window.c:281
msgid "Show the Planner User Guide" msgid "Show the Planner User Guide"
msgstr "Visa Planner användarmanual" msgstr "Visa Planner användarmanual"
#: src/planner-window.c:235 #: src/planner-window.c:284
msgid "_About" msgid "_About"
msgstr "_Om" msgstr "_Om"
#: src/planner-window.c:235 #: src/planner-window.c:284
msgid "About this application" msgid "About this application"
msgstr "Om detta program" msgstr "Om detta program"
#: src/planner-window.c:657 #. Note: these strings are leaked.
#: src/planner-window.c:558
#, c-format
msgid "Switch to the view \"%s\""
msgstr "Växla till vyn \"%s\""
#: src/planner-window.c:711
msgid "Open a file" msgid "Open a file"
msgstr "Öppna en fil" msgstr "Öppna en fil"
#. I18n: Translators, list your names here, newline separated if there #. I18n: Translators, list your names here, newline separated if there
#. * are more than one, to appear in the about box. #. * are more than one, to appear in the about box.
#. #.
#: src/planner-window.c:1025 src/planner-window.c:1032 #: src/planner-window.c:1079 src/planner-window.c:1086
msgid "translator_credits" msgid "translator_credits"
msgstr "" msgstr ""
"Christian Rose\n" "Christian Rose\n"
...@@ -1869,58 +1874,58 @@ msgstr "" ...@@ -1869,58 +1874,58 @@ msgstr ""
"Skicka synpunkter på översättningen till sv@li.org" "Skicka synpunkter på översättningen till sv@li.org"
#. "Copyright \xc2\xa9" #. "Copyright \xc2\xa9"
#: src/planner-window.c:1029 #: src/planner-window.c:1083
msgid "A Project Management application for the GNOME desktop" msgid "A Project Management application for the GNOME desktop"
msgstr "Ett projekthanteringsprogram för GNOME-skrivbordet" msgstr "Ett projekthanteringsprogram för GNOME-skrivbordet"
#: src/planner-window.c:1039 #: src/planner-window.c:1093
msgid "The Planner Homepage" msgid "The Planner Homepage"
msgstr "Planners hemsida" msgstr "Planners hemsida"
#: src/planner-window.c:1145 #: src/planner-window.c:1199
msgid "If you don't save, changes made the last minute will be discarded." msgid "If you don't save, changes made the last minute will be discarded."
msgstr "" msgstr ""
"Om du inte sparar kommer ändringarna gjorda den senaste minuten att gå " "Om du inte sparar kommer ändringarna gjorda den senaste minuten att gå "
"förlorade." "förlorade."
#: src/planner-window.c:1150 #: src/planner-window.c:1204
#, c-format #, c-format
msgid "If you don't save, changes made the last %d minutes will be discarded." msgid "If you don't save, changes made the last %d minutes will be discarded."
msgstr "" msgstr ""
"Om du inte sparar kommer ändringarna gjorda de senaste %d minuterna att gå " "Om du inte sparar kommer ändringarna gjorda de senaste %d minuterna att gå "
"förlorade." "förlorade."
#: src/planner-window.c:1155 #: src/planner-window.c:1209
msgid "If you don't save, changes made the last hour will be discarded." msgid "If you don't save, changes made the last hour will be discarded."
msgstr "" msgstr ""
"Om du inte sparar kommer ändringarna gjorda den senaste timmen att gå " "Om du inte sparar kommer ändringarna gjorda den senaste timmen att gå "
"förlorade." "förlorade."
#: src/planner-window.c:1160 #: src/planner-window.c:1214
#, c-format #, c-format
msgid "If you don't save, changes made the last %d hours will be discarded." msgid "If you don't save, changes made the last %d hours will be discarded."
msgstr "" msgstr ""
"Om du inte sparar kommer ändringarna gjorda de senaste %d timmarna att gå " "Om du inte sparar kommer ändringarna gjorda de senaste %d timmarna att gå "
"förlorade." "förlorade."
#: src/planner-window.c:1167 #: src/planner-window.c:1221
#, c-format #, c-format
msgid "Save changes to document '%s' before closing?" msgid "Save changes to document '%s' before closing?"
msgstr "Spara ändringarna i dokumentet \"%s\" innan det stängs?" msgstr "Spara ändringarna i dokumentet \"%s\" innan det stängs?"
#: src/planner-window.c:1191 #: src/planner-window.c:1245
msgid "C_lose without saving" msgid "C_lose without saving"
msgstr "S_täng utan att spara" msgstr "S_täng utan att spara"
#: src/planner-window.c:1197 #: src/planner-window.c:1251
msgid "_Cancel" msgid "_Cancel"
msgstr "_Avbryt" msgstr "_Avbryt"
#: src/planner-window.c:1299 #: src/planner-window.c:1353
msgid "Save a file" msgid "Save a file"
msgstr "Spara en fil" msgstr "Spara en fil"
#: src/planner-window.c:1538 #: src/planner-window.c:1592
msgid "" msgid ""
"You have opened a file that was saved with an old version of Planner.\n" "You have opened a file that was saved with an old version of Planner.\n"
"\n" "\n"
...@@ -1949,7 +1954,7 @@ msgstr "" ...@@ -1949,7 +1954,7 @@ msgstr ""
"\"Återställ alla restriktioner\" i \"Redigera\"-menyn." "\"Återställ alla restriktioner\" i \"Redigera\"-menyn."
#. Hack. #. Hack.
#: src/planner-window.c:1573 #: src/planner-window.c:1627
msgid "Unnamed database project" msgid "Unnamed database project"
msgstr "Namnlöst databasprojekt" msgstr "Namnlöst databasprojekt"
......
...@@ -402,7 +402,7 @@ ttable_view_ttable_status_updated (PlannerTtableChart *chart, ...@@ -402,7 +402,7 @@ ttable_view_ttable_status_updated (PlannerTtableChart *chart,
const gchar *message, const gchar *message,
PlannerView *view) PlannerView *view)
{ {
g_message("This message should appear in the status bar:\n%s", message); planner_window_set_status (view->main_window, message);
} }
static void static void
......
...@@ -203,36 +203,86 @@ static guint signals[LAST_SIGNAL]; ...@@ -203,36 +203,86 @@ static guint signals[LAST_SIGNAL];
static GtkActionEntry entries[] = { static GtkActionEntry entries[] = {
{ "File", NULL, N_("_File"), NULL, NULL, NULL }, { "File",
{ "FileNew", GTK_STOCK_NEW, N_("_New Project"), "<Control>n", N_("Create a new project"), G_CALLBACK (window_new_cb) }, NULL, N_("_File"), NULL, NULL,
{ "FileOpen", GTK_STOCK_OPEN, N_("_Open..."), "F3", N_("Open a project"), G_CALLBACK (window_open_cb) }, NULL
{ "FileSave", GTK_STOCK_SAVE, N_("_Save"), "<Control>s", N_("Save the current project"), G_CALLBACK (window_save_cb) }, },
{ "Export", NULL, N_("_Export"), NULL, NULL, NULL }, { "FileNew",
{ "FileSaveAs", GTK_STOCK_SAVE_AS, N_("Save _As..."), "<Shift><Control>s", N_("Save the current project with a different name"), G_CALLBACK (window_save_as_cb) }, GTK_STOCK_NEW, N_("_New Project"), "<Control>n", N_("Create a new project"),
{ "FilePrint", GTK_STOCK_PRINT, N_("_Print..."), "<Control>p", N_("Print the current project"), G_CALLBACK (window_print_cb) }, G_CALLBACK (window_new_cb)
{ "FilePrintPreview", GTK_STOCK_PRINT_PREVIEW, N_("Print Pre_view"), "<Shift><Control>p", N_("Print preview of the current project"), G_CALLBACK (window_print_preview_cb) }, },
{ "FileClose", GTK_STOCK_CLOSE, N_("_Close"), "<Control>w", N_("Close the current file"), G_CALLBACK (window_close_cb) }, { "FileOpen",
{ "FileExit", GTK_STOCK_QUIT, N_("_Quit"), "<Control>q", N_("Exit the program"), G_CALLBACK (window_exit_cb) }, GTK_STOCK_OPEN, N_("_Open..."), "F3", N_("Open a project"),
G_CALLBACK (window_open_cb) },
{ "Edit", NULL, N_("_Edit"), NULL, NULL, NULL }, { "FileSave",
{ "EditUndo", GTK_STOCK_UNDO, N_("_Undo"), "<Control>z", N_("Undo the last action"), G_CALLBACK (window_undo_cb) }, GTK_STOCK_SAVE, N_("_Save"), "<Control>s", N_("Save the current project"),
{ "EditRedo", GTK_STOCK_REDO, N_("_Redo"), "<Control>r", N_("Redo the undone action"), G_CALLBACK (window_redo_cb) }, G_CALLBACK (window_save_cb) },
{ "Export",
{ "View", NULL, N_("_View"), NULL, NULL, NULL }, NULL, N_("_Export"), NULL, NULL,
NULL },
{ "Actions", NULL, N_("_Actions"), NULL, NULL, NULL }, { "FileSaveAs",
GTK_STOCK_SAVE_AS, N_("Save _As..."), "<Shift><Control>s", N_("Save the current project with a different name"),
{ "Project", NULL, N_("_Project"), NULL, NULL, NULL }, G_CALLBACK (window_save_as_cb) },
{ "ManageCalendars", NULL, N_("_Manage Calendars"), NULL, NULL, G_CALLBACK (window_manage_calendars_cb) }, { "FilePrint",
{ "EditDayTypes", NULL, N_("Edit Day _Types"), NULL, NULL, G_CALLBACK (window_edit_day_types_cb) }, GTK_STOCK_PRINT, N_("_Print..."), "<Control>p", N_("Print the current project"),
{ "EditPhases", NULL, N_("Edit Project _Phases"), NULL, NULL, G_CALLBACK (window_edit_phases_cb) }, G_CALLBACK (window_print_cb) },
{ "EditProjectProps", GTK_STOCK_PROPERTIES, N_("_Edit Project Properties"), NULL, N_("Edit the project properties"), G_CALLBACK (window_project_props_cb) }, { "FilePrintPreview",
GTK_STOCK_PRINT_PREVIEW, N_("Print Pre_view"), "<Shift><Control>p", N_("Print preview of the current project"),
/* { "PreferencesEditPreferences", NULL, NULL, NULL, NULL, G_CALLBACK (window_preferences_cb) },*/ G_CALLBACK (window_print_preview_cb) },
{ "FileClose",
{ "Help", NULL, N_("_Help"), NULL, NULL, NULL }, GTK_STOCK_CLOSE, N_("_Close"), "<Control>w", N_("Close the current file"),
{ "HelpHelp", GTK_STOCK_HELP, N_("_User Guide"), "F1", N_("Show the Planner User Guide"), G_CALLBACK (window_help_cb) }, G_CALLBACK (window_close_cb) },
{ "HelpAbout", GNOME_STOCK_ABOUT, N_("_About"), NULL, N_("About this application"), G_CALLBACK (window_about_cb) }, { "FileExit",
GTK_STOCK_QUIT, N_("_Quit"), "<Control>q", N_("Exit the program"),
G_CALLBACK (window_exit_cb) },
{ "Edit",
NULL, N_("_Edit"), NULL, NULL,
NULL },
{ "EditUndo",
GTK_STOCK_UNDO, N_("_Undo"), "<Control>z", N_("Undo the last action"),
G_CALLBACK (window_undo_cb) },
{ "EditRedo",
GTK_STOCK_REDO, N_("_Redo"), "<Control>r", N_("Redo the undone action"),
G_CALLBACK (window_redo_cb) },
{ "View",
NULL, N_("_View"), NULL, NULL,
NULL },
{ "Actions",
NULL, N_("_Actions"), NULL, NULL,
NULL },
{ "Project",
NULL, N_("_Project"), NULL, NULL,
NULL },
{ "ManageCalendars",
NULL, N_("_Manage Calendars"), NULL, NULL,
G_CALLBACK (window_manage_calendars_cb) },
{ "EditDayTypes",
NULL, N_("Edit Day _Types"), NULL, NULL,
G_CALLBACK (window_edit_day_types_cb) },
{ "EditPhases",
NULL, N_("Edit Project _Phases"), NULL, NULL,
G_CALLBACK (window_edit_phases_cb) },
{ "EditProjectProps",
GTK_STOCK_PROPERTIES, N_("_Edit Project Properties"), NULL, N_("Edit the project properties"),
G_CALLBACK (window_project_props_cb) },
/* { "PreferencesEditPreferences",
NULL, NULL, NULL, NULL,
G_CALLBACK (window_preferences_cb) },*/
{ "Help",
NULL, N_("_Help"), NULL, NULL,
NULL },
{ "HelpHelp",
GTK_STOCK_HELP, N_("_User Guide"), "F1", N_("Show the Planner User Guide"),
G_CALLBACK (window_help_cb) },
{ "HelpAbout",
GNOME_STOCK_ABOUT, N_("_About"), NULL, N_("About this application"),
G_CALLBACK (window_about_cb) },
}; };
static guint n_entries = G_N_ELEMENTS(entries); static guint n_entries = G_N_ELEMENTS(entries);
...@@ -391,7 +441,7 @@ window_populate (PlannerWindow *window) ...@@ -391,7 +441,7 @@ window_populate (PlannerWindow *window)
GtkRadioActionEntry *r_entries; GtkRadioActionEntry *r_entries;
gchar *xml_string_tmp, *xml_string; gchar *xml_string_tmp, *xml_string;
GError *error = NULL; GError *error = NULL;
gchar *xml_string_full = const gchar *xml_string_full =
"<ui>" "<ui>"
"<menubar name='MenuBar'>" "<menubar name='MenuBar'>"
"<menu action='View'>" "<menu action='View'>"
...@@ -504,6 +554,10 @@ window_populate (PlannerWindow *window) ...@@ -504,6 +554,10 @@ window_populate (PlannerWindow *window)
r_entries[view_num].label = planner_view_get_menu_label (view); r_entries[view_num].label = planner_view_get_menu_label (view);
r_entries[view_num].value = view_num; r_entries[view_num].value = view_num;
/* Note: these strings are leaked. */
r_entries[view_num].tooltip = g_strdup_printf (_("Switch to the view \"%s\""),
planner_view_get_label (view));
xml_string_tmp = xml_string; xml_string_tmp = xml_string;
xml_string = g_strdup_printf ("%s<menuitem action='%s'/>", xml_string = g_strdup_printf ("%s<menuitem action='%s'/>",
xml_string, r_entries[view_num].name); xml_string, r_entries[view_num].name);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment