Commits May 2013

commits@lists.geany.org

1 participants
50 discussions

[geany/geany] d3b88f: Fix a leak searching for the keybinding group row
by Colomban Wendling 31 May '13

31 May '13

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Fri, 31 May 2013 23:56:31 UTC Commit: d3b88fb5b14d4fc9b4de52cea02888308f7864f6 https://github.com/geany/geany/commit/d3b88fb5b14d4fc9b4de52cea02888308f786… Log Message: ----------- Fix a leak searching for the keybinding group row Modified Paths: -------------- src/prefs.c Modified: src/prefs.c 8 files changed, 6 insertions(+), 2 deletions(-) =================================================================== @@ -339,19 +339,23 @@ void prefs_kb_search_name(const gchar *search) GtkTreeIter iter; gboolean valid; GtkTreeModel *model; - gchar *name; + model = gtk_tree_view_get_model(tree); valid = gtk_tree_model_get_iter_first(model, &iter); while (valid) { + gchar *name; + gtk_tree_model_get(model, &iter, KB_TREE_ACTION, &name, -1); - if(g_strcmp0(name, search) == 0) + if (g_strcmp0(name, search) == 0) { GtkTreePath *path = gtk_tree_model_get_path(model, &iter); gtk_tree_view_scroll_to_cell(tree, path, NULL, FALSE, .0f, .0f); gtk_tree_path_free(path); + g_free(name); break; } + g_free(name); valid = gtk_tree_model_iter_next(model, &iter); } } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 44fcdf: Minor tweak to plugin manager button spacing
by Matthew Brush 25 May '13

25 May '13

Branch: refs/heads/master Author: Matthew Brush <matt(a)geany.org> Committer: Matthew Brush <matt(a)geany.org> Date: Sun, 26 May 2013 00:02:49 UTC Commit: 44fcdf1b7ccb76de124253b8f77d3a5f0f4206e4 https://github.com/geany/geany/commit/44fcdf1b7ccb76de124253b8f77d3a5f0f420… Log Message: ----------- Minor tweak to plugin manager button spacing Modified Paths: -------------- src/plugins.c Modified: src/plugins.c 5 files changed, 3 insertions(+), 2 deletions(-) =================================================================== @@ -1477,9 +1477,10 @@ static void pm_show_dialog(GtkMenuItem *menuitem, gpointer user_data) gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(desc_win), table); hbox = gtk_hbox_new(FALSE, 0); + gtk_box_set_spacing(GTK_BOX(hbox), 6); gtk_box_pack_start(GTK_BOX(hbox), label2, TRUE, TRUE, 0); - gtk_box_pack_start(GTK_BOX(hbox), pm_widgets.help_button, FALSE, FALSE, 4); - gtk_box_pack_start(GTK_BOX(hbox), pm_widgets.configure_button, FALSE, FALSE, 4); + gtk_box_pack_start(GTK_BOX(hbox), pm_widgets.help_button, FALSE, FALSE, 0); + gtk_box_pack_start(GTK_BOX(hbox), pm_widgets.configure_button, FALSE, FALSE, 0); gtk_box_pack_start(GTK_BOX(hbox), pm_widgets.keybindings_button, FALSE, FALSE, 0); label_vbox = gtk_vbox_new(FALSE, 3); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 169a2f: Keybindings for plugins
by Pavel Roschin 25 May '13

25 May '13

Branch: refs/heads/master Author: Pavel Roschin <roshin(a)scriptumplus.ru> Committer: Matthew Brush <matt(a)geany.org> Date: Sat, 25 May 2013 23:49:06 UTC Commit: 169a2f49577457b2c1484fcf4e5ebf6c222547c0 https://github.com/geany/geany/commit/169a2f49577457b2c1484fcf4e5ebf6c22254… Log Message: ----------- Keybindings for plugins Modified Paths: -------------- src/keybindings.c src/keybindings.h src/plugins.c src/prefs.c src/prefs.h Modified: src/keybindings.c 38 files changed, 26 insertions(+), 12 deletions(-) =================================================================== @@ -907,6 +907,31 @@ static GtkWidget *create_dialog(void) } +static void key_dialog_show_prefs() +{ + GtkWidget *wid; + + prefs_show_dialog(); + /* select the KB page */ + wid = ui_lookup_widget(ui_widgets.prefs_dialog, "frame22"); + if (wid != NULL) + { + GtkNotebook *nb = GTK_NOTEBOOK(ui_lookup_widget(ui_widgets.prefs_dialog, "notebook2")); + if (nb != NULL) + { + gtk_notebook_set_current_page(nb, gtk_notebook_page_num(nb, wid)); + } + } +} + + +void keybindings_dialog_show_prefs_scroll(const gchar *name) +{ + key_dialog_show_prefs(); + prefs_kb_search_name(name); +} + + /* non-modal keyboard shortcuts dialog, so user can edit whilst seeing the shortcuts */ static GtkWidget *key_dialog = NULL; @@ -914,18 +939,7 @@ static void on_dialog_response(GtkWidget *dialog, gint response, gpointer user_d { if (response == GTK_RESPONSE_APPLY) { - GtkWidget *wid; - - prefs_show_dialog(); - /* select the KB page */ - wid = ui_lookup_widget(ui_widgets.prefs_dialog, "frame22"); - if (wid != NULL) - { - GtkNotebook *nb = GTK_NOTEBOOK(ui_lookup_widget(ui_widgets.prefs_dialog, "notebook2")); - - if (nb != NULL) - gtk_notebook_set_current_page(nb, gtk_notebook_page_num(nb, wid)); - } + key_dialog_show_prefs(); } gtk_widget_destroy(dialog); key_dialog = NULL; Modified: src/keybindings.h 2 files changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -286,6 +286,8 @@ GeanyKeyBinding *keybindings_set_item(GeanyKeyGroup *group, gsize key_id, gboolean keybindings_check_event(GdkEventKey *ev, GeanyKeyBinding *kb); +void keybindings_dialog_show_prefs_scroll(const gchar *name); + G_END_DECLS #endif Modified: src/plugins.c 14 files changed, 13 insertions(+), 1 deletions(-) =================================================================== @@ -1160,6 +1160,7 @@ enum PLUGIN_COLUMN_DESCRIPTION, PLUGIN_COLUMN_PLUGIN, PLUGIN_N_COLUMNS, + PM_BUTTON_KEYBINDINGS, PM_BUTTON_CONFIGURE, PM_BUTTON_HELP }; @@ -1173,6 +1174,7 @@ enum GtkWidget *filename_label; GtkWidget *author_label; GtkWidget *configure_button; + GtkWidget *keybindings_button; GtkWidget *help_button; } PluginManagerWidgets; @@ -1188,6 +1190,8 @@ static void pm_update_buttons(Plugin *p) gtk_widget_set_sensitive(pm_widgets.configure_button, (p->configure || p->configure_single) && is_active); gtk_widget_set_sensitive(pm_widgets.help_button, p->help != NULL && is_active); + gtk_widget_set_sensitive(pm_widgets.keybindings_button, + p->key_group && p->key_group->plugin_key_count > 0 && is_active); } @@ -1356,6 +1360,8 @@ static void pm_on_plugin_button_clicked(GtkButton *button, gpointer user_data) plugin_show_configure(&p->public); else if (GPOINTER_TO_INT(user_data) == PM_BUTTON_HELP && p->help != NULL) p->help(); + else if (GPOINTER_TO_INT(user_data) == PM_BUTTON_KEYBINDINGS && p->key_group && p->key_group->plugin_key_count > 0) + keybindings_dialog_show_prefs_scroll(p->info.name); } } } @@ -1434,6 +1440,11 @@ static void pm_show_dialog(GtkMenuItem *menuitem, gpointer user_data) label = geany_wrap_label_new(_("Choose which plugins should be loaded at startup:")); + pm_widgets.keybindings_button = gtk_button_new_with_label(_("Keybindings")); + gtk_widget_set_sensitive(pm_widgets.keybindings_button, FALSE); + g_signal_connect(pm_widgets.keybindings_button, "clicked", + G_CALLBACK(pm_on_plugin_button_clicked), GINT_TO_POINTER(PM_BUTTON_KEYBINDINGS)); + pm_widgets.configure_button = gtk_button_new_from_stock(GTK_STOCK_PREFERENCES); gtk_widget_set_sensitive(pm_widgets.configure_button, FALSE); g_signal_connect(pm_widgets.configure_button, "clicked", @@ -1468,7 +1479,8 @@ static void pm_show_dialog(GtkMenuItem *menuitem, gpointer user_data) hbox = gtk_hbox_new(FALSE, 0); gtk_box_pack_start(GTK_BOX(hbox), label2, TRUE, TRUE, 0); gtk_box_pack_start(GTK_BOX(hbox), pm_widgets.help_button, FALSE, FALSE, 4); - gtk_box_pack_start(GTK_BOX(hbox), pm_widgets.configure_button, FALSE, FALSE, 0); + gtk_box_pack_start(GTK_BOX(hbox), pm_widgets.configure_button, FALSE, FALSE, 4); + gtk_box_pack_start(GTK_BOX(hbox), pm_widgets.keybindings_button, FALSE, FALSE, 0); label_vbox = gtk_vbox_new(FALSE, 3); gtk_box_pack_start(GTK_BOX(label_vbox), hbox, FALSE, FALSE, 0); Modified: src/prefs.c 23 files changed, 23 insertions(+), 0 deletions(-) =================================================================== @@ -334,6 +334,29 @@ static void kb_set_shortcut(GtkTreeStore *store, GtkTreeIter *iter, } +void prefs_kb_search_name(const gchar *search) +{ + GtkTreeIter iter; + gboolean valid; + GtkTreeModel *model; + gchar *name; + model = gtk_tree_view_get_model(tree); + valid = gtk_tree_model_get_iter_first(model, &iter); + while (valid) + { + gtk_tree_model_get(model, &iter, KB_TREE_ACTION, &name, -1); + if(g_strcmp0(name, search) == 0) + { + GtkTreePath *path = gtk_tree_model_get_path(model, &iter); + gtk_tree_view_scroll_to_cell(tree, path, NULL, FALSE, .0f, .0f); + gtk_tree_path_free(path); + break; + } + valid = gtk_tree_model_iter_next(model, &iter); + } +} + + static void kb_init(void) { GtkTreeIter parent, iter; Modified: src/prefs.h 2 files changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -58,6 +58,8 @@ void prefs_show_dialog(void); +void prefs_kb_search_name(const gchar *search); + G_END_DECLS #endif -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 0dc9e4: Import fix from upstream Scintilla to fix crash upon DnD with GTK3
by Colomban Wendling 25 May '13

25 May '13

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Sat, 25 May 2013 15:48:49 UTC Commit: 0dc9e4ec382e8057753c3debea4b4462e0a6944d https://github.com/geany/geany/commit/0dc9e4ec382e8057753c3debea4b4462e0a69… Log Message: ----------- Import fix from upstream Scintilla to fix crash upon DnD with GTK3 This imports Scintilla commit e488315f2d30e1795f0899779bac948da41b4eef from HG, "Bug: [#1481]. Incorrect event copying on GTK+ 3.x." Modified Paths: -------------- scintilla/gtk/ScintillaGTK.cxx Modified: scintilla/gtk/ScintillaGTK.cxx 19 files changed, 14 insertions(+), 5 deletions(-) =================================================================== @@ -122,7 +122,7 @@ class ScintillaGTK : public ScintillaBase { SelectionText primary; - GdkEventButton evbtn; + GdkEventButton *evbtn; bool capturedMouse; bool dragWasDropped; int lastKey; @@ -354,7 +354,7 @@ static ScintillaGTK *ScintillaFromWidget(GtkWidget *widget) { ScintillaGTK::ScintillaGTK(_ScintillaObject *sci_) : adjustmentv(0), adjustmenth(0), scrollBarWidth(30), scrollBarHeight(30), - capturedMouse(false), dragWasDropped(false), + evbtn(0), capturedMouse(false), dragWasDropped(false), lastKey(0), rectangularSelectionModifier(SCMOD_CTRL), parentClass(0), im_context(NULL), lastWheelMouseDirection(0), @@ -392,6 +392,10 @@ static ScintillaGTK *ScintillaFromWidget(GtkWidget *widget) { ScintillaGTK::~ScintillaGTK() { g_idle_remove_by_data(this); + if (evbtn) { + gdk_event_free(reinterpret_cast<GdkEvent *>(evbtn)); + evbtn = 0; + } } static void UnRefCursor(GdkCursor *cursor) { @@ -824,14 +828,15 @@ bool ScintillaGTK::DragThreshold(Point ptStart, Point ptNow) { } void ScintillaGTK::StartDrag() { + PLATFORM_ASSERT(evbtn != 0); dragWasDropped = false; inDragDrop = ddDragging; GtkTargetList *tl = gtk_target_list_new(clipboardCopyTargets, nClipboardCopyTargets); gtk_drag_begin(GTK_WIDGET(PWidget(wMain)), tl, static_cast<GdkDragAction>(GDK_ACTION_COPY | GDK_ACTION_MOVE), - evbtn.button, - reinterpret_cast<GdkEvent *>(&evbtn)); + evbtn->button, + reinterpret_cast<GdkEvent *>(evbtn)); } static std::string ConvertText(char *s, size_t len, const char *charSetDest, @@ -1761,7 +1766,11 @@ gint ScintillaGTK::PressThis(GdkEventButton *event) { if (event->type != GDK_BUTTON_PRESS) return FALSE; - evbtn = *event; + if (evbtn) { + gdk_event_free(reinterpret_cast<GdkEvent *>(evbtn)); + evbtn = 0; + } + evbtn = reinterpret_cast<GdkEventButton *>(gdk_event_copy(reinterpret_cast<GdkEvent *>(event))); Point pt; pt.x = int(event->x); pt.y = int(event->y); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 6cff31: Import fix from upstream Scintilla to fix crash on drag and drop
by Colomban Wendling 25 May '13

25 May '13

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Sat, 25 May 2013 15:45:07 UTC Commit: 6cff31488e2376e34d77c2fe5b2bc8875cab9096 https://github.com/geany/geany/commit/6cff31488e2376e34d77c2fe5b2bc8875cab9… Log Message: ----------- Import fix from upstream Scintilla to fix crash on drag and drop This imports Scintilla commit 06f36a3217229ec2c2a360e370ae1b07597ce7b6 from HG, "Fix crashes with SelectionText instances that did not have \0 terminators." Modified Paths: -------------- scintilla/gtk/ScintillaGTK.cxx Modified: scintilla/gtk/ScintillaGTK.cxx 14 files changed, 7 insertions(+), 7 deletions(-) =================================================================== @@ -1492,15 +1492,15 @@ void ScintillaGTK::GetGtkSelectionText(GtkSelectionData *selectionData, Selectio if (selectionTypeData == GDK_TARGET_STRING) { if (IsUnicodeMode()) { // Unknown encoding so assume in Latin1 - dest = UTF8FromLatin1(dest.c_str(), len); - selText.Copy(dest.c_str(), dest.length(), SC_CP_UTF8, 0, selText.rectangular, false); + dest = UTF8FromLatin1(dest.c_str(), dest.length()); + selText.Copy(dest.c_str(), dest.length()+1, SC_CP_UTF8, 0, selText.rectangular, false); } else { // Assume buffer is in same encoding as selection - selText.Copy(dest.c_str(), dest.length(), pdoc->dbcsCodePage, + selText.Copy(dest.c_str(), dest.length()+1, pdoc->dbcsCodePage, vs.styles[STYLE_DEFAULT].characterSet, isRectangular, false); } } else { // UTF-8 - selText.Copy(dest.c_str(), dest.length(), SC_CP_UTF8, 0, isRectangular, false); + selText.Copy(dest.c_str(), dest.length()+1, SC_CP_UTF8, 0, isRectangular, false); const char *charSetBuffer = CharacterSetID(); if (!IsUnicodeMode() && *charSetBuffer) { // Convert to locale @@ -1533,9 +1533,9 @@ void ScintillaGTK::ReceivedSelection(GtkSelectionData *selection_data) { sel.Range(sel.Main()).Start(); if (selText.rectangular) { - PasteRectangular(selStart, selText.s, selText.len); + PasteRectangular(selStart, selText.s, selText.len-1); } else { - InsertPaste(selStart, selText.s, selText.len); + InsertPaste(selStart, selText.s, selText.len-1); } EnsureCaretVisible(); } @@ -1578,7 +1578,7 @@ void ScintillaGTK::GetSelection(GtkSelectionData *selection_data, guint info, Se { std::string tmpstr = Document::TransformLineEnds(text->s, text->len, SC_EOL_LF); newline_normalized = new SelectionText(); - newline_normalized->Copy(tmpstr.c_str(), tmpstr.length(), SC_CP_UTF8, 0, text->rectangular, false); + newline_normalized->Copy(tmpstr.c_str(), tmpstr.length()+1, SC_CP_UTF8, 0, text->rectangular, false); text = newline_normalized; } #endif -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/www.geany.org] 8d3b1d: Drop userprefs and 'guess lexer' to simplify usage
by Enrico Tröger 23 May '13

23 May '13

Branch: refs/heads/master Author: Enrico Tröger <enrico.troeger(a)uvena.de> Committer: Enrico Tröger <enrico.troeger(a)uvena.de> Date: Thu, 23 May 2013 20:29:38 UTC Commit: 8d3b1d413060d72fa2230313120ec8f2df49c171 https://github.com/geany/www.geany.org/commit/8d3b1d413060d72fa2230313120ec… Log Message: ----------- Drop userprefs and 'guess lexer' to simplify usage Modified Paths: -------------- pastebin/forms.py pastebin/highlight.py pastebin/templates/pastebin/base.html pastebin/templates/pastebin/snippet_details.html pastebin/templates/pastebin/snippet_form.html pastebin/templates/pastebin/snippet_new.html pastebin/templates/pastebin/userprefs.html pastebin/urls.py pastebin/views.py Modified: pastebin/forms.py 24 files changed, 2 insertions(+), 22 deletions(-) =================================================================== @@ -12,10 +12,9 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. - from django import forms from django.utils.translation import ugettext_lazy as _ -from pastebin.highlight import LEXER_LIST_ALL, LEXER_LIST, LEXER_DEFAULT +from pastebin.highlight import LEXER_LIST, LEXER_DEFAULT from pastebin.models import Snippet, Spamword import datetime @@ -54,13 +53,7 @@ class SnippetForm(forms.ModelForm): def __init__(self, request, *args, **kwargs): forms.ModelForm.__init__(self, *args, **kwargs) self.request = request - - try: - if self.request.session['userprefs'].get('display_all_lexer', False): - self.fields['lexer'].choices = LEXER_LIST_ALL - except KeyError: - pass - + # set author self.fields['author'].initial = self.request.session.get('author', '') #---------------------------------------------------------------------- @@ -74,7 +67,6 @@ def clean_content(self): #---------------------------------------------------------------------- def save(self, parent=None, *args, **kwargs): - # Set parent snippet if parent: self.instance.parent = parent @@ -104,15 +96,3 @@ class Meta: 'title', 'author', 'lexer',) - - -######################################################################## -class UserSettingsForm(forms.Form): - - default_name = forms.CharField(label=_(u'Default Name'), required=False) - display_all_lexer = forms.BooleanField( - label=_(u'Display all lexers'), - required=False, - widget=forms.CheckboxInput, - help_text=_(u'This also enables the super secret \'guess lexer\' function.'), - ) Modified: pastebin/highlight.py 22 files changed, 5 insertions(+), 17 deletions(-) =================================================================== @@ -3,12 +3,12 @@ # it under the terms of the GNU Affero General Public License as published by # the Free Software Foundation, either version 3 of the License, or # (at your option) any later version. -# +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU Affero General Public License for more details. -# +# # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. @@ -19,8 +19,7 @@ from pygments.lexers import ( PythonLexer, get_all_lexers, - get_lexer_by_name, - guess_lexer) + get_lexer_by_name) LEXER_LIST_ALL = sorted([(i[1][0], i[0]) for i in get_all_lexers()]) @@ -65,22 +64,11 @@ def pygmentize(code_string, lexer_name=LEXER_DEFAULT): if lexer_name: lexer = get_lexer_by_name(lexer_name) else: - raise Exception + raise Exception(u'Unknown lexer') except: - try: - lexer = guess_lexer(code_string) - except: - lexer = PythonLexer() + lexer = PythonLexer() try: return highlight(code_string, lexer, NakedHtmlFormatter()) except: return escape(code_string) - - -#---------------------------------------------------------------------- -def guess_code_lexer(code_string, default_lexer='unknown'): - try: - return guess_lexer(code_string).name - except ValueError: - return default_lexer Modified: pastebin/templates/pastebin/base.html 4 files changed, 0 insertions(+), 4 deletions(-) =================================================================== @@ -13,7 +13,6 @@ {% url 'about' as url_about %} {% url 'api' as url_api %} {% url 'snippet_list' as url_snippet_list %} -{% url 'snippet_userprefs' as url_snippet_userprefs %} <div class="row"> <div class="navbar"> @@ -31,9 +30,6 @@ <li class="{% if request.path = url_snippet_list %} active{% endif %}"> <a href="{{ url_snippet_list }}">Recent snippets</a> </li> - <li class="{% if request.path = url_snippet_userprefs %} active{% endif %}"> - <a href="{{ url_snippet_userprefs }}">Settings</a> - </li> </ul> </div> </div> Modified: pastebin/templates/pastebin/snippet_details.html 18 files changed, 0 insertions(+), 18 deletions(-) =================================================================== @@ -82,24 +82,6 @@ $('div.snippet div.line#l'+j).toggleClass('marked'); }); }); - - {% if request.session.userprefs.display_all_lexer %} - /** - * Lexer Guessing - */ - $('#guess_lexer_btn').click(function(){ - $.getJSON('{% url 'snippet_guess_lexer' %}', - {'codestring': $('#id_content').val()}, - function(data){ - if(data.lexer == "unknown"){ - $('#guess_lexer_btn').css('color', 'red'); - }else{ - $('#id_lexer').val(data.lexer); - $('#guess_lexer_btn').css('color', 'inherit'); - } - }); - }); - {% endif %} }); </script> {% endblock %} Modified: pastebin/templates/pastebin/snippet_form.html 3 files changed, 0 insertions(+), 3 deletions(-) =================================================================== @@ -28,9 +28,6 @@ {% endfor %} <div class="control-group"> <div class="controls"> - {% if request.session.userprefs.display_all_lexer %} - <input class="btn" type="button" value="Guess lexer" id="guess_lexer_btn"/> - {% endif %} <input type="submit" value="Paste it" class="btn"/> </div> </div> Modified: pastebin/templates/pastebin/snippet_new.html 23 files changed, 0 insertions(+), 23 deletions(-) =================================================================== @@ -15,26 +15,3 @@ </div> {% endblock %} - - - -{% block footer_js %} -<script type="text/javascript"> -jQuery(document).ready(function(){ - {% if request.session.userprefs.display_all_lexer %} - $('#guess_lexer_btn').click(function(){ - $.getJSON('{% url 'snippet_guess_lexer' %}', - {'codestring': $('#id_content').val()}, - function(data){ - if(data.lexer == "unknown"){ - $('#guess_lexer_btn').css('color', 'red'); - }else{ - $('#id_lexer').val(data.lexer); - $('#guess_lexer_btn').css('color', 'inherit'); - } - }); - }); - {% endif %} -}); -</script> -{% endblock %} Modified: pastebin/templates/pastebin/userprefs.html 42 files changed, 0 insertions(+), 42 deletions(-) =================================================================== @@ -1,42 +0,0 @@ -{% extends "pastebin/base.html" %} - - -{% block meta_title %} - User settings | {{ block.super }} -{% endblock %} - - -{% block main %} -<div class="well"> - <h2>User Settings</h2> - - {% if settings_saved %} - <p class="label label-success"> - Your preferences were successfully saved. - </p> - {% endif %} - - <form class="form-horizontal" method="post" action="{% url 'snippet_userprefs' %}"> - {% csrf_token %} - {% for field in settings_form %} - <div> - <div class="control-group"> - {{ field.label_tag }} - <div class="controls"> - {{ field }} - </div> - </div> - </div> - {% endfor %} - <div class="control-group"> - <div class="controls"> - <input type="submit" value="Save settings" class="btn"/> - </div> - </div> - </form> - - <p class="label label-info"> - Remember: Your data is stored in a cookie. - </p> -</div> -{% endblock %} Modified: pastebin/urls.py 6 files changed, 2 insertions(+), 4 deletions(-) =================================================================== @@ -3,12 +3,12 @@ # it under the terms of the GNU Affero General Public License as published by # the Free Software Foundation, either version 3 of the License, or # (at your option) any later version. -# +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU Affero General Public License for more details. -# +# # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. @@ -27,9 +27,7 @@ url(r'^api/$', 'pastebin.views.api_create'), url(r'^$', 'pastebin.views.snippet_new', name='home'), - url(r'^guess/$', 'pastebin.views.guess_lexer', name='snippet_guess_lexer'), url(r'^latest/$', 'pastebin.views.snippet_list', name='snippet_list'), - url(r'^your-settings/$', 'pastebin.views.userprefs', name='snippet_userprefs'), url(r'^(?P<snippet_id>[a-zA-Z0-9]+)/$', 'pastebin.views.snippet_details', name='snippet_details'), url(r'^(?P<snippet_id>[a-zA-Z0-9]+)/delete/$', 'pastebin.views.snippet_delete', name='snippet_delete'), url(r'^(?P<snippet_id>[a-zA-Z0-9]+)/raw/$', 'pastebin.views.snippet_details', {'template_name': 'pastebin/snippet_details_raw.html', 'is_raw': True}, name='snippet_details_raw'), Modified: pastebin/views.py 74 files changed, 1 insertions(+), 73 deletions(-) =================================================================== @@ -21,16 +21,12 @@ HttpResponse, HttpResponseForbidden from django.shortcuts import render_to_response, get_object_or_404 from django.template.context import RequestContext -from django.utils import simplejson -from django.utils.translation import ugettext_lazy as _ from django.views.decorators.csrf import csrf_exempt from django.views.decorators.http import require_POST from honeypot.decorators import check_honeypot from pastebin.api.create import CreateSnippetApiController, SnippetValidationError -from pastebin.forms import SnippetForm, UserSettingsForm -from pastebin.highlight import pygmentize, guess_code_lexer +from pastebin.forms import SnippetForm from pastebin.models import Snippet -import difflib #---------------------------------------------------------------------- @@ -166,74 +162,6 @@ def snippet_list(request, template_name='pastebin/snippet_list.html'): #---------------------------------------------------------------------- -def userprefs(request, template_name='pastebin/userprefs.html'): - - if request.method == 'POST': - settings_form = UserSettingsForm(request.POST, initial=request.session.get('userprefs', None)) - if settings_form.is_valid(): - request.session['userprefs'] = settings_form.cleaned_data - settings_saved = True - else: - settings_form = UserSettingsForm(initial=request.session.get('userprefs', None)) - settings_saved = False - - template_context = { - 'settings_form': settings_form, - 'settings_saved': settings_saved, - } - - return render_to_response( - template_name, - template_context, - RequestContext(request)) - - -#---------------------------------------------------------------------- -def snippet_diff(request, template_name='pastebin/snippet_diff.html'): - - if request.GET.get('a') and request.GET.get('a').isdigit() \ - and request.GET.get('b') and request.GET.get('b').isdigit(): - try: - fileA = Snippet.objects.get(pk=int(request.GET.get('a'))) - fileB = Snippet.objects.get(pk=int(request.GET.get('b'))) - except ObjectDoesNotExist: - return HttpResponseBadRequest(u'Selected file(s) does not exist.') - else: - return HttpResponseBadRequest(u'You must select two snippets.') - - if fileA.content != fileB.content: - d = difflib.unified_diff( - fileA.content.splitlines(), - fileB.content.splitlines(), - 'Original', - 'Current', - lineterm='' - ) - difftext = '\n'.join(d) - difftext = pygmentize(difftext, 'diff') - else: - difftext = _(u'No changes were made between this two files.') - - template_context = { - 'difftext': difftext, - 'fileA': fileA, - 'fileB': fileB, - } - - return render_to_response( - template_name, - template_context, - RequestContext(request)) - - -#---------------------------------------------------------------------- -def guess_lexer(request): - code_string = request.GET.get('codestring', False) - response = simplejson.dumps({'lexer': guess_code_lexer(code_string)}) - return HttpResponse(response) - - -#---------------------------------------------------------------------- def _get_site(request): if hasattr(request, 'site'): return request.site -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/www.geany.org] 8c435a: Remember author name
by Enrico Tröger 23 May '13

23 May '13

Branch: refs/heads/master Author: Enrico Tröger <enrico.troeger(a)uvena.de> Committer: Enrico Tröger <enrico.troeger(a)uvena.de> Date: Thu, 23 May 2013 20:20:54 UTC Commit: 8c435a9e0475fa2debaca9e3e1dd3b4c508a70e5 https://github.com/geany/www.geany.org/commit/8c435a9e0475fa2debaca9e3e1dd3… Log Message: ----------- Remember author name Modified Paths: -------------- pastebin/forms.py Modified: pastebin/forms.py 8 files changed, 4 insertions(+), 4 deletions(-) =================================================================== @@ -61,10 +61,7 @@ def __init__(self, request, *args, **kwargs): except KeyError: pass - try: - self.fields['author'].initial = self.request.session['userprefs'].get('default_name', '') - except KeyError: - pass + self.fields['author'].initial = self.request.session.get('author', '') #---------------------------------------------------------------------- def clean_content(self): @@ -94,6 +91,9 @@ def save(self, parent=None, *args, **kwargs): self.request.session['snippet_list'] = [] self.request.session['snippet_list'].append(self.instance.pk) + # Remember author + self.request.session['author'] = self.instance.author + return self.request, self.instance ######################################################################## -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/www.geany.org] 5d65f3: Remain sessions after browser close (useful for the pastebin)
by Enrico Tröger 23 May '13

23 May '13

Branch: refs/heads/master Author: Enrico Tröger <enrico.troeger(a)uvena.de> Committer: Enrico Tröger <enrico.troeger(a)uvena.de> Date: Thu, 23 May 2013 20:11:07 UTC Commit: 5d65f3eff758c88548b20b50dc86b44ea8eca967 https://github.com/geany/www.geany.org/commit/5d65f3eff758c88548b20b50dc86b… Log Message: ----------- Remain sessions after browser close (useful for the pastebin) Modified Paths: -------------- geany/settings.py Modified: geany/settings.py 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -363,7 +363,7 @@ # caching & sessions SESSION_ENGINE = "django.contrib.sessions.backends.cached_db" -SESSION_EXPIRE_AT_BROWSER_CLOSE = True +SESSION_EXPIRE_AT_BROWSER_CLOSE = False DASHBOARD_TAGS = ( ("mezzanine_tags.app_list",), -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/www.geany.org] 961fd1: Update About page
by Enrico Tröger 23 May '13

23 May '13

Branch: refs/heads/master Author: Enrico Tröger <enrico.troeger(a)uvena.de> Committer: Enrico Tröger <enrico.troeger(a)uvena.de> Date: Thu, 23 May 2013 20:10:43 UTC Commit: 961fd13af5e9fc9da8454d82c64fe2cf95ac883d https://github.com/geany/www.geany.org/commit/961fd13af5e9fc9da8454d82c64fe… Log Message: ----------- Update About page Modified Paths: -------------- pastebin/templates/pastebin/about.html Modified: pastebin/templates/pastebin/about.html 10 files changed, 2 insertions(+), 8 deletions(-) =================================================================== @@ -15,17 +15,11 @@ getting a url like http://{{ request.site.domain }}/abc1234</li> <li>paste the url into an IRC or IM conversation</li> <li>someone responds by reading and perhaps submitting a modification of your code</li> -<li>you then view the modification, maybe using the built in diff tool to help locate the changes</li> </ul> -<h3>How can I view the differences between two posts?</h3> -<p>When you view a post, you have the opportunity of editing the text - <strong>this creates a new post</strong>, -but when you view it, you'll be given a 'diff' link which allows you to compare the changes between the old and the new version</p> -<p>This is a powerful feature, great for seeing exactly what lines someone changed</p> - <h3>How can I delete a post?</h3> -<p>If you clicked the "remember me" checkbox when posting, you will be able to delete post from the same computer you posted from - -simply view the post and click the "delete post" link.</p> +<p>Your posted snippets are remembered in your session, you will be able to delete the snippet from the same browser you posted from - +simply view the post and click the "delete" link.</p> <p>In other cases, contact us and we will delete it for you.</p> <h3>Can I get the source?</h3> -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/www.geany.org] 64bb87: Re-enable snippet deletion by adding new snippets to the user's session
by Enrico Tröger 23 May '13

23 May '13

Branch: refs/heads/master Author: Enrico Tröger <enrico.troeger(a)uvena.de> Committer: Enrico Tröger <enrico.troeger(a)uvena.de> Date: Thu, 23 May 2013 20:06:54 UTC Commit: 64bb87ced49e110c7ce84618137e1bb117e91729 https://github.com/geany/www.geany.org/commit/64bb87ced49e110c7ce84618137e1… Log Message: ----------- Re-enable snippet deletion by adding new snippets to the user's session Modified Paths: -------------- pastebin/forms.py pastebin/templates/pastebin/snippet_details.html Modified: pastebin/forms.py 5 files changed, 5 insertions(+), 0 deletions(-) =================================================================== @@ -89,6 +89,11 @@ def save(self, parent=None, *args, **kwargs): # Save snippet in the db forms.ModelForm.save(self, *args, **kwargs) + # Add snippet to the user's session + if not self.request.session.get('snippet_list', False): + self.request.session['snippet_list'] = [] + self.request.session['snippet_list'].append(self.instance.pk) + return self.request, self.instance ######################################################################## Modified: pastebin/templates/pastebin/snippet_details.html 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -19,7 +19,7 @@ <abbr title="Time to life">TTL:</abbr> {{ snippet.expires|timeuntil }} — {% if snippet.pk|in_list:request.session.snippet_list %} - <a onclick="return confirm('Really delete this snippet?')" href="{% url 'snippet_delete' snippet.secret_id %}">Delete now!</a> + <a onclick="return confirm('Really delete this snippet?')" href="{% url 'snippet_delete' snippet.secret_id %}">Delete</a> — {% endif %} {% if snippet.parent_id %} -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits May 2013