Re: [Geany-devel] SF.net SVN: geany:[5223] trunk

14 Sep 2010

On 14 September 2010 00:39,  ntrel@users.sourceforge.net wrote:
...
Revision: 5223
         http://geany.svn.sourceforge.net/geany/?rev=5223&view=rev
Author:   ntrel
Date:     2010-09-13 14:39:32 +0000 (Mon, 13 Sep 2010)
Log Message:
Remove 3 popup menu items to save space:
Find Document Usage because Find Usage can be used instead.
Gives a lot of rubbish I didn't want, but can live with it.
...
Go to Tag Declaration because Go to Tag Definition is more common.
Hi Nick,
Dissagree strongly about removing go to tag declaration.
Goto tag declaration is very much used in C++ because it gets the
whole class declaration, not just the implementation of the specific
function.  To find the class in the symbols list I have to remember
its name which is often not visible at the point of function use.  And
of course overloaded functions can have several declarations in
several classes.
I can see the point for C but it is very useful for other languages.
I can't find anywhere where this change was discussed with users, but
maybe thats just my search fu.
Please reconsider.
Cheers
Lex
...
Go to Line because the toolbar item can be used instead.
Modified Paths:
trunk/ChangeLog
   trunk/geany.glade
   trunk/src/interface.c
   trunk/src/keybindings.c
   trunk/src/ui_utils.c
Modified: trunk/ChangeLog

--- trunk/ChangeLog     2010-09-09 17:31:27 UTC (rev 5222)
+++ trunk/ChangeLog     2010-09-13 14:39:32 UTC (rev 5223)
@@ -1,3 +1,12 @@
+2010-09-13  Nick Treleaven  <nick(dot)treleaven(at)btinternet(dot)com>



src/interface.c, src/keybindings.c, src/ui_utils.c, geany.glade:


Remove 3 popup menu items to save space:
Find Document Usage because Find Usage can be used instead.
Go to Tag Declaration because Go to Tag Definition is more common.
Go to Line because the toolbar item can be used instead.



2010-09-09  Nick Treleaven  <nick(dot)treleaven(at)btinternet(dot)com>
* src/build.c:
@@ -15,7 +24,7 @@
   Mention the filetype wordchars setting can be overridden by the
   whitespace_chars filetypes.common setting.
 * src/highlighting.c, src/encodings.c, tagmanager/tm_file_entry.c:

Remove NULL checks when calling g_free() (patch Erik de Castro


Remove NULL checks when calling g_free() (patch by Erik de Castro

Lopo, thanks).
 * src/document.c:
   Show Save As when saving if the document filename doesn't have an
Modified: trunk/geany.glade
--- trunk/geany.glade   2010-09-09 17:31:27 UTC (rev 5222)
+++ trunk/geany.glade   2010-09-13 14:39:32 UTC (rev 5223)
@@ -2503,11 +2503,23 @@
  </child>
<child>

<widget class="GtkMenuItem" id="menu_open_selected_file2">


<widget class="GtkImageMenuItem" id="menu_open_selected_file2">

<property name="visible">True</property>
      <property name="label" translatable="yes">Open Selected F_ile</property>
      <property name="use_underline">True</property>
      <signal name="activate" handler="on_menu_open_selected_file1_activate" last_modification_time="Wed, 24 Jan 2007 18:48:44 GMT"/>


<child internal-child="image">
<widget class="GtkImage" id="image3482">
<property name="visible">True</property>
<property name="stock">gtk-open</property>
<property name="icon_size">1</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
</widget>
</child>

</widget>
  </child>
@@ -2546,7 +2558,7 @@
      <property name="use_underline">True</property>
<child internal-child="image">

<widget class="GtkImage" id="image3411">


<widget class="GtkImage" id="image3483">

<property name="visible">True</property>
         <property name="stock">gtk-add</property>
         <property name="icon_size">1</property>
@@ -2625,7 +2637,7 @@
      <property name="use_underline">True</property>
<child internal-child="image">

<widget class="GtkImage" id="image3412">


<widget class="GtkImage" id="image3484">

<property name="visible">True</property>
         <property name="stock">gtk-add</property>
         <property name="icon_size">1</property>
@@ -2657,7 +2669,7 @@
      <property name="use_underline">True</property>
<child internal-child="image">

<widget class="GtkImage" id="image3413">


<widget class="GtkImage" id="image3485">

<property name="visible">True</property>
         <property name="stock">gtk-add</property>
         <property name="icon_size">1</property>
@@ -2696,7 +2708,7 @@
      <signal name="activate" handler="on_find_usage1_activate" last_modification_time="Fri, 27 May 2005 21:55:12 GMT"/>
<child internal-child="image">

<widget class="GtkImage" id="image3414">


<widget class="GtkImage" id="image3486">

<property name="visible">True</property>
         <property name="stock">gtk-find</property>
         <property name="icon_size">1</property>
@@ -2710,16 +2722,16 @@
  </child>
<child>

<widget class="GtkImageMenuItem" id="find_document_usage1">


<widget class="GtkImageMenuItem" id="goto_tag_definition1">

<property name="visible">True</property>

<property name="label" translatable="yes">Find _Document Usage</property>


<property name="label" translatable="yes">Go to _Tag Definition</property>

<property name="use_underline">True</property>

<signal name="activate" handler="on_find_document_usage1_activate" last_modification_time="Thu, 17 Jul 2008 13:42:25 GMT"/>


<signal name="activate" handler="on_goto_tag_definition1" last_modification_time="Thu, 09 Sep 2010 11:30:52 GMT"/>

<child internal-child="image">

<widget class="GtkImage" id="image3415">


<widget class="GtkImage" id="image3487">

<property name="visible">True</property>

<property name="stock">gtk-find</property>


<property name="stock">gtk-jump-to</property>

<property name="icon_size">1</property>
         <property name="xalign">0.5</property>
         <property name="yalign">0.5</property>
@@ -2731,24 +2743,6 @@
  </child>
<child>

<widget class="GtkMenuItem" id="goto_tag_definition1">
<property name="visible">True</property>
<property name="label" translatable="yes">Go to _Tag Definition</property>
<property name="use_underline">True</property>
<signal name="activate" handler="on_goto_tag_definition1" last_modification_time="Thu, 09 Sep 2010 11:30:52 GMT"/>
</widget>
</child>

<child>
<widget class="GtkMenuItem" id="goto_tag_declaration1">
<property name="visible">True</property>
<property name="label" translatable="yes">Go to T_ag Declaration</property>
<property name="use_underline">True</property>
<signal name="activate" handler="on_goto_tag_declaration1" last_modification_time="Thu, 09 Sep 2010 11:30:52 GMT"/>
</widget>
</child>

<child>

<widget class="GtkMenuItem" id="context_action1">
      <property name="visible">True</property>
      <property name="label" translatable="yes">Conte_xt Action</property>
@@ -2756,33 +2750,6 @@
      <signal name="activate" handler="on_context_action1_activate" last_modification_time="Fri, 13 Apr 2007 18:37:55 GMT"/>
    </widget>
  </child>


<child>
<widget class="GtkSeparatorMenuItem" id="separator15">
<property name="visible">True</property>
</widget>
</child>

<child>
<widget class="GtkImageMenuItem" id="go_to_line">
<property name="visible">True</property>
<property name="label" translatable="yes">_Go to Line</property>
<property name="use_underline">True</property>
<signal name="activate" handler="on_go_to_line_activate" last_modification_time="Sat, 16 Jul 2005 11:20:32 GMT"/>

<child internal-child="image">
<widget class="GtkImage" id="image3416">
<property name="visible">True</property>
<property name="stock">gtk-jump-to</property>
<property name="icon_size">1</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
</widget>
</child>
</widget>
</child>

</widget>
<widget class="GtkDialog" id="prefs_dialog">
Modified: trunk/src/interface.c
--- trunk/src/interface.c       2010-09-09 17:31:27 UTC (rev 5222)
+++ trunk/src/interface.c       2010-09-13 14:39:32 UTC (rev 5223)
@@ -2002,12 +2002,13 @@
  GtkWidget *menu_select_all2;
  GtkWidget *separator26;
  GtkWidget *menu_open_selected_file2;

GtkWidget *image3482;

GtkWidget *separator36;
  GtkWidget *menu_format2;
  GtkWidget *commands1;
  GtkWidget *separator17;
  GtkWidget *comments;

GtkWidget *image3411;


GtkWidget *image3483;

GtkWidget *comments_menu;
  GtkWidget *add_changelog_entry2;
  GtkWidget *insert_file_header2;
@@ -2016,24 +2017,19 @@
  GtkWidget *insert_gpl_notice1;
  GtkWidget *insert_bsd_license_notice1;
  GtkWidget *insert_date2;

GtkWidget *image3412;


GtkWidget *image3484;

GtkWidget *insert_date2_menu;
  GtkWidget *invisible10;
  GtkWidget *insert_include1;

GtkWidget *image3413;


GtkWidget *image3485;

GtkWidget *insert_include1_menu;
  GtkWidget *invisible3;
  GtkWidget *separator7;
  GtkWidget *find_usage1;

GtkWidget *image3414;
GtkWidget *find_document_usage1;
GtkWidget *image3415;


GtkWidget *image3486;

GtkWidget *goto_tag_definition1;

GtkWidget *goto_tag_declaration1;


GtkWidget *image3487;

GtkWidget *context_action1;

GtkWidget *separator15;
GtkWidget *go_to_line;
GtkWidget *image3416;

GtkAccelGroup *accel_group;
accel_group = gtk_accel_group_new ();
@@ -2083,10 +2079,14 @@
  gtk_container_add (GTK_CONTAINER (edit_menu1), separator26);
  gtk_widget_set_sensitive (separator26, FALSE);

menu_open_selected_file2 = gtk_menu_item_new_with_mnemonic (_("Open Selected F_ile"));


menu_open_selected_file2 = gtk_image_menu_item_new_with_mnemonic (_("Open Selected F_ile"));

gtk_widget_show (menu_open_selected_file2);
  gtk_container_add (GTK_CONTAINER (edit_menu1), menu_open_selected_file2);

image3482 = gtk_image_new_from_stock ("gtk-open", GTK_ICON_SIZE_MENU);
gtk_widget_show (image3482);
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_open_selected_file2), image3482);


separator36 = gtk_separator_menu_item_new ();
  gtk_widget_show (separator36);
  gtk_container_add (GTK_CONTAINER (edit_menu1), separator36);
@@ -2109,9 +2109,9 @@
  gtk_widget_show (comments);
  gtk_container_add (GTK_CONTAINER (edit_menu1), comments);

image3411 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU);
gtk_widget_show (image3411);
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (comments), image3411);


image3483 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU);
gtk_widget_show (image3483);
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (comments), image3483);

comments_menu = gtk_menu_new ();
  gtk_menu_item_set_submenu (GTK_MENU_ITEM (comments), comments_menu);
@@ -2144,9 +2144,9 @@
  gtk_widget_show (insert_date2);
  gtk_container_add (GTK_CONTAINER (edit_menu1), insert_date2);

image3412 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU);
gtk_widget_show (image3412);
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (insert_date2), image3412);


image3484 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU);
gtk_widget_show (image3484);
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (insert_date2), image3484);

insert_date2_menu = gtk_menu_new ();
  gtk_menu_item_set_submenu (GTK_MENU_ITEM (insert_date2), insert_date2_menu);
@@ -2158,9 +2158,9 @@
  gtk_widget_show (insert_include1);
  gtk_container_add (GTK_CONTAINER (edit_menu1), insert_include1);

image3413 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU);
gtk_widget_show (image3413);
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (insert_include1), image3413);


image3485 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU);
gtk_widget_show (image3485);
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (insert_include1), image3485);

insert_include1_menu = gtk_menu_new ();
  gtk_menu_item_set_submenu (GTK_MENU_ITEM (insert_include1), insert_include1_menu);
@@ -2177,43 +2177,22 @@
  gtk_widget_show (find_usage1);
  gtk_container_add (GTK_CONTAINER (edit_menu1), find_usage1);

image3414 = gtk_image_new_from_stock ("gtk-find", GTK_ICON_SIZE_MENU);
gtk_widget_show (image3414);
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (find_usage1), image3414);


image3486 = gtk_image_new_from_stock ("gtk-find", GTK_ICON_SIZE_MENU);
gtk_widget_show (image3486);
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (find_usage1), image3486);


find_document_usage1 = gtk_image_menu_item_new_with_mnemonic (_("Find _Document Usage"));
gtk_widget_show (find_document_usage1);
gtk_container_add (GTK_CONTAINER (edit_menu1), find_document_usage1);

image3415 = gtk_image_new_from_stock ("gtk-find", GTK_ICON_SIZE_MENU);
gtk_widget_show (image3415);
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (find_document_usage1), image3415);

goto_tag_definition1 = gtk_menu_item_new_with_mnemonic (_("Go to _Tag Definition"));


goto_tag_definition1 = gtk_image_menu_item_new_with_mnemonic (_("Go to _Tag Definition"));

gtk_widget_show (goto_tag_definition1);
  gtk_container_add (GTK_CONTAINER (edit_menu1), goto_tag_definition1);

goto_tag_declaration1 = gtk_menu_item_new_with_mnemonic (_("Go to T_ag Declaration"));
gtk_widget_show (goto_tag_declaration1);
gtk_container_add (GTK_CONTAINER (edit_menu1), goto_tag_declaration1);


image3487 = gtk_image_new_from_stock ("gtk-jump-to", GTK_ICON_SIZE_MENU);
gtk_widget_show (image3487);
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (goto_tag_definition1), image3487);

context_action1 = gtk_menu_item_new_with_mnemonic (_("Conte_xt Action"));
  gtk_widget_show (context_action1);
  gtk_container_add (GTK_CONTAINER (edit_menu1), context_action1);

separator15 = gtk_separator_menu_item_new ();
gtk_widget_show (separator15);
gtk_container_add (GTK_CONTAINER (edit_menu1), separator15);
gtk_widget_set_sensitive (separator15, FALSE);

go_to_line = gtk_image_menu_item_new_with_mnemonic (_("_Go to Line"));
gtk_widget_show (go_to_line);
gtk_container_add (GTK_CONTAINER (edit_menu1), go_to_line);

image3416 = gtk_image_new_from_stock ("gtk-jump-to", GTK_ICON_SIZE_MENU);
gtk_widget_show (image3416);
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (go_to_line), image3416);


g_signal_connect ((gpointer) undo1, "activate",
                    G_CALLBACK (on_undo1_activate),
                    NULL);
@@ -2259,21 +2238,12 @@
  g_signal_connect ((gpointer) find_usage1, "activate",
                    G_CALLBACK (on_find_usage1_activate),
                    NULL);

g_signal_connect ((gpointer) find_document_usage1, "activate",
G_CALLBACK (on_find_document_usage1_activate),
NULL);

g_signal_connect ((gpointer) goto_tag_definition1, "activate",
                    G_CALLBACK (on_goto_tag_definition1),
                    NULL);

g_signal_connect ((gpointer) goto_tag_declaration1, "activate",
G_CALLBACK (on_goto_tag_declaration1),
NULL);

g_signal_connect ((gpointer) context_action1, "activate",
                    G_CALLBACK (on_context_action1_activate),
                    NULL);

g_signal_connect ((gpointer) go_to_line, "activate",
G_CALLBACK (on_go_to_line_activate),
NULL);

/* Store pointers to all widgets, for use by lookup_widget(). */
  GLADE_HOOKUP_OBJECT_NO_REF (edit_menu1, edit_menu1, "edit_menu1");
@@ -2288,12 +2258,13 @@
  GLADE_HOOKUP_OBJECT (edit_menu1, menu_select_all2, "menu_select_all2");
  GLADE_HOOKUP_OBJECT (edit_menu1, separator26, "separator26");
  GLADE_HOOKUP_OBJECT (edit_menu1, menu_open_selected_file2, "menu_open_selected_file2");

GLADE_HOOKUP_OBJECT (edit_menu1, image3482, "image3482");

GLADE_HOOKUP_OBJECT (edit_menu1, separator36, "separator36");
  GLADE_HOOKUP_OBJECT (edit_menu1, menu_format2, "menu_format2");
  GLADE_HOOKUP_OBJECT (edit_menu1, commands1, "commands1");
  GLADE_HOOKUP_OBJECT (edit_menu1, separator17, "separator17");
  GLADE_HOOKUP_OBJECT (edit_menu1, comments, "comments");

GLADE_HOOKUP_OBJECT (edit_menu1, image3411, "image3411");


GLADE_HOOKUP_OBJECT (edit_menu1, image3483, "image3483");

GLADE_HOOKUP_OBJECT (edit_menu1, comments_menu, "comments_menu");
  GLADE_HOOKUP_OBJECT (edit_menu1, add_changelog_entry2, "add_changelog_entry2");
  GLADE_HOOKUP_OBJECT (edit_menu1, insert_file_header2, "insert_file_header2");
@@ -2302,24 +2273,19 @@
  GLADE_HOOKUP_OBJECT (edit_menu1, insert_gpl_notice1, "insert_gpl_notice1");
  GLADE_HOOKUP_OBJECT (edit_menu1, insert_bsd_license_notice1, "insert_bsd_license_notice1");
  GLADE_HOOKUP_OBJECT (edit_menu1, insert_date2, "insert_date2");

GLADE_HOOKUP_OBJECT (edit_menu1, image3412, "image3412");


GLADE_HOOKUP_OBJECT (edit_menu1, image3484, "image3484");

GLADE_HOOKUP_OBJECT (edit_menu1, insert_date2_menu, "insert_date2_menu");
  GLADE_HOOKUP_OBJECT (edit_menu1, invisible10, "invisible10");
  GLADE_HOOKUP_OBJECT (edit_menu1, insert_include1, "insert_include1");

GLADE_HOOKUP_OBJECT (edit_menu1, image3413, "image3413");


GLADE_HOOKUP_OBJECT (edit_menu1, image3485, "image3485");

GLADE_HOOKUP_OBJECT (edit_menu1, insert_include1_menu, "insert_include1_menu");
  GLADE_HOOKUP_OBJECT (edit_menu1, invisible3, "invisible3");
  GLADE_HOOKUP_OBJECT (edit_menu1, separator7, "separator7");
  GLADE_HOOKUP_OBJECT (edit_menu1, find_usage1, "find_usage1");

GLADE_HOOKUP_OBJECT (edit_menu1, image3414, "image3414");
GLADE_HOOKUP_OBJECT (edit_menu1, find_document_usage1, "find_document_usage1");
GLADE_HOOKUP_OBJECT (edit_menu1, image3415, "image3415");


GLADE_HOOKUP_OBJECT (edit_menu1, image3486, "image3486");

GLADE_HOOKUP_OBJECT (edit_menu1, goto_tag_definition1, "goto_tag_definition1");

GLADE_HOOKUP_OBJECT (edit_menu1, goto_tag_declaration1, "goto_tag_declaration1");


GLADE_HOOKUP_OBJECT (edit_menu1, image3487, "image3487");

GLADE_HOOKUP_OBJECT (edit_menu1, context_action1, "context_action1");

GLADE_HOOKUP_OBJECT (edit_menu1, separator15, "separator15");
GLADE_HOOKUP_OBJECT (edit_menu1, go_to_line, "go_to_line");
GLADE_HOOKUP_OBJECT (edit_menu1, image3416, "image3416");

gtk_menu_set_accel_group (GTK_MENU (edit_menu1), accel_group);
Modified: trunk/src/keybindings.c
--- trunk/src/keybindings.c     2010-09-09 17:31:27 UTC (rev 5222)
+++ trunk/src/keybindings.c     2010-09-13 14:39:32 UTC (rev 5223)
@@ -727,12 +727,9 @@
group = g_ptr_array_index(keybinding_groups, GEANY_KEY_GROUP_SEARCH);
       GEANY_ADD_POPUP_ACCEL(GEANY_KEYS_SEARCH_FINDUSAGE, find_usage1);

GEANY_ADD_POPUP_ACCEL(GEANY_KEYS_SEARCH_FINDDOCUMENTUSAGE, find_document_usage1);

group = g_ptr_array_index(keybinding_groups, GEANY_KEY_GROUP_GOTO);

GEANY_ADD_POPUP_ACCEL(GEANY_KEYS_GOTO_LINE, go_to_line);

GEANY_ADD_POPUP_ACCEL(GEANY_KEYS_GOTO_TAGDEFINITION, goto_tag_definition1);

GEANY_ADD_POPUP_ACCEL(GEANY_KEYS_GOTO_TAGDECLARATION, goto_tag_declaration1);

/* Format and Commands share the menu bar submenus */
       /* Build menu items are set if the build menus are created */
Modified: trunk/src/ui_utils.c
--- trunk/src/ui_utils.c        2010-09-09 17:31:27 UTC (rev 5222)
+++ trunk/src/ui_utils.c        2010-09-13 14:39:32 UTC (rev 5223)
@@ -68,7 +68,7 @@
        * also be GtkAction objects, so check each pointer before using it */
       GPtrArray       *document_buttons;
       GtkWidget       *menu_insert_include_items[2];

GtkWidget       *popup_goto_items[4];


GtkWidget       *popup_goto_items[3];

GtkWidget       *popup_copy_items[3];
       GtkWidget       *menu_copy_items[3];
       GtkWidget       *redo_items[3];
@@ -2033,10 +2033,11 @@
main_widgets.progressbar = progress_bar_create();

/* current word sensitive items */

widgets.popup_goto_items[0] = ui_lookup_widget(main_widgets.editor_menu, "goto_tag_definition1");

widgets.popup_goto_items[1] = ui_lookup_widget(main_widgets.editor_menu, "goto_tag_declaration1");


widgets.popup_goto_items[1] = ui_lookup_widget(main_widgets.editor_menu, "context_action1");

widgets.popup_goto_items[2] = ui_lookup_widget(main_widgets.editor_menu, "find_usage1");

widgets.popup_goto_items[3] = ui_lookup_widget(main_widgets.editor_menu, "find_document_usage1");




widgets.popup_copy_items[0] = ui_lookup_widget(main_widgets.editor_menu, "cut1");
       widgets.popup_copy_items[1] = ui_lookup_widget(main_widgets.editor_menu, "copy1");
       widgets.popup_copy_items[2] = ui_lookup_widget(main_widgets.editor_menu, "delete1");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
_______________________________________________
Geany-commits mailing list
Geany-commits@uvena.de
http://lists.uvena.de/cgi-bin/mailman/listinfo/geany-commits

    

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

Re: [Geany-devel] SF.net SVN: geany:[5223] trunk

Log Message:

Modified Paths:

Modified: trunk/ChangeLog

Modified: trunk/geany.glade

Modified: trunk/src/interface.c

Modified: trunk/src/keybindings.c

Modified: trunk/src/ui_utils.c