Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] 2 commits: Add NSIS Script for portable windows installer
by Philipp Hörist 08 Jan '17

08 Jan '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: f433c099 by Philipp Hörist at 2017-01-08T20:40:54+01:00 Add NSIS Script for portable windows installer - - - - - 1bef52cf by Philipp Hörist at 2017-01-08T20:41:56+01:00 Merge branch 'portable' into 'master' Add NSIS Script for portable windows installer See merge request !26 - - - - - 2 changed files: - appveyor.yml - + gajim-portable.nsi Changes: ===================================== appveyor.yml ===================================== --- a/appveyor.yml +++ b/appveyor.yml @@ -44,10 +44,12 @@ install: # Make Installer - ps: '& "C:\Program Files (x86)\NSIS\makensis.exe" gajim.nsi' + - ps: '& "C:\Program Files (x86)\NSIS\makensis.exe" gajim-portable.nsi' # Push Installer Exe - ps: $env:TIME_STRING=(get-date -UFormat "%Y-%m-%d").ToString() - ps: Push-AppveyorArtifact Gajim.exe -FileName "Gajim-default-$($env:TIME_STRING).exe" + - ps: Push-AppveyorArtifact Gajim-Portable.exe -FileName "Gajim-portable-default-$($env:TIME_STRING).exe" build: off ===================================== gajim-portable.nsi ===================================== --- /dev/null +++ b/gajim-portable.nsi @@ -0,0 +1,259 @@ +!include "MUI2.nsh" + +Name "Gajim" +OutFile "Gajim-Portable.exe" +SetCompressor /final /solid lzma + +!define myAppName "Gajim" + +InstallDir "$PROFILE\Gajim" +RequestExecutionLevel user + +!define MUI_ICON "${NSISDIR}\Contrib\Graphics\Icons\orange-install.ico" +!define MUI_HEADERIMAGE +!define MUI_HEADERIMAGE_BITMAP "data\pixmaps\nsis_header.bmp" +!define MUI_WELCOMEFINISHPAGE_BITMAP "data\pixmaps\nsis_wizard.bmp" +!define MUI_UNWELCOMEFINISHPAGE_BITMAP "data\pixmaps\nsis_wizard.bmp" +!define MUI_COMPONENTSPAGE_SMALLDESC +!define MUI_ABORTWARNING + +!insertmacro MUI_PAGE_WELCOME +!insertmacro MUI_PAGE_LICENSE "COPYING" +!insertmacro MUI_PAGE_COMPONENTS +!insertmacro MUI_PAGE_DIRECTORY +!insertmacro MUI_PAGE_INSTFILES +!insertmacro MUI_PAGE_FINISH + +!insertmacro MUI_UNPAGE_WELCOME +!insertmacro MUI_UNPAGE_CONFIRM +!insertmacro MUI_UNPAGE_INSTFILES +!insertmacro MUI_UNPAGE_FINISH + +;Show all languages, despite user's codepage +!define MUI_LANGDLL_ALLLANGUAGES + +!insertmacro MUI_LANGUAGE "English" +!insertmacro MUI_LANGUAGE "French" +!insertmacro MUI_LANGUAGE "German" +!insertmacro MUI_LANGUAGE "Italian" +!insertmacro MUI_LANGUAGE "Russian" +!insertmacro MUI_LANGUAGE "Hebrew" +!insertmacro MUI_RESERVEFILE_LANGDLL + +; English +LangString NAME_Emoticons ${LANG_ENGLISH} "Emoticons" +LangString NAME_Iconsets ${LANG_ENGLISH} "Iconsets" +LangString NAME_Languages ${LANG_ENGLISH} "Languages" +LangString NAME_SecLanguagesOther ${LANG_ENGLISH} "Other" +LangString NAME_Themes ${LANG_ENGLISH} "Themes" +LangString DESC_SecGajim ${LANG_ENGLISH} "Installs the main Gajim files." + + +; French +LangString NAME_Emoticons ${LANG_FRENCH} "Emoticônes" +LangString NAME_Iconsets ${LANG_FRENCH} "Bibliothèque d'icônes" +LangString NAME_Languages ${LANG_FRENCH} "Langues" +LangString NAME_SecLanguagesOther ${LANG_FRENCH} "Autre" +LangString NAME_Themes ${LANG_FRENCH} "Thèmes" +LangString DESC_SecGajim ${LANG_FRENCH} "Installer les fichiers principaux de Gajim." + + +; German +LangString NAME_Emoticons ${LANG_GERMAN} "Emoticons" +LangString NAME_Iconsets ${LANG_GERMAN} "Symbolsets" +LangString NAME_Languages ${LANG_GERMAN} "Sprachen" +LangString NAME_SecLanguagesOther ${LANG_GERMAN} "Sonstige" +LangString NAME_Themes ${LANG_GERMAN} "Designs" +LangString DESC_SecGajim ${LANG_GERMAN} "Installiert die Hauptdateien von Gajim." + + +; Italian +LangString NAME_Emoticons ${LANG_ITALIAN} "Emoticons" +LangString NAME_Iconsets ${LANG_ITALIAN} "Set di icone" +LangString NAME_Languages ${LANG_ITALIAN} "Lingue" +LangString NAME_SecLanguagesOther ${LANG_ITALIAN} "Altre" +LangString NAME_Themes ${LANG_ITALIAN} "Temi" +LangString DESC_SecGajim ${LANG_ITALIAN} "Installa i file principali di Gajim." + + +; Russian +LangString NAME_Emoticons ${LANG_RUSSIAN} "Ñìàéëèêè" +LangString NAME_Iconsets ${LANG_RUSSIAN} "Òåìû èêîíîê" +LangString NAME_Languages ${LANG_RUSSIAN} "ßçûêè" +LangString NAME_SecLanguagesOther ${LANG_RUSSIAN} "Äðóãîå" +LangString NAME_Themes ${LANG_RUSSIAN} "Òåìû" +LangString DESC_SecGajim ${LANG_RUSSIAN} "Óñòàíîâêà îñíîâíûõ ôàéëîâ Gajim." + + +; Hebrew +LangString NAME_Emoticons ${LANG_HEBREW} "øâùåðéí" +LangString NAME_Iconsets ${LANG_HEBREW} "îòøëé öìîéú" +LangString NAME_Languages ${LANG_HEBREW} "ùôåú" +LangString NAME_SecLanguagesOther ${LANG_HEBREW} "àçøåú" +LangString NAME_Themes ${LANG_HEBREW} "òøëàåú ðåùà" +LangString DESC_SecGajim ${LANG_HEBREW} "îú÷éï ÷áöé Gajim òé÷øééí." + +Section "Gajim" SecGajim + SectionIn RO + + SetOutPath "$INSTDIR" + File "AUTHORS" + File "COPYING" + File "THANKS" + File "THANKS.artists" + File /r "build" + + SetOutPath "$INSTDIR\data" + File /r "data\gui" + File /r "data\moods" + File /r "data\activities" + File /r "data\other" + File /r "data\pixmaps" + File /r "data\sounds" + + SetOutPath "$INSTDIR\icons" + File /r "icons\hicolor" + + SetOutPath "$INSTDIR\build" + CreateShortCut "$INSTDIR\Gajim-Portable.lnk" "$INSTDIR\build\Gajim.exe" \ + "-c ..\UserData" "" "" SW_SHOWNORMAL "" "Gajim Portable" + +SectionEnd + +Section "Plugins" SecPlugins + SetOutPath "$INSTDIR\plugins" + File /r "plugins\plugin_installer" +SectionEnd + +SectionGroup $(NAME_Emoticons) + +Section "animated" SecEmoticonsAnimated + SetOutPath "$INSTDIR\data\emoticons" + File /r "data\emoticons\animated" +SectionEnd + +Section "static" SecEmoticonsStatic + SectionIn RO + SetOutPath "$INSTDIR\data\emoticons" + File /r "data\emoticons\static" +SectioNEnd + +Section "static-big" SecEmoticonsStaticBig + SetOutPath "$INSTDIR\data\emoticons" + File /r "data\emoticons\static-big" +SectionEnd + +SectionGroupEnd + +SectionGroup $(NAME_Iconsets) + +Section "dcraven" SecIconsetsDcraven + SectionIn RO + SetOutPath "$INSTDIR\data\iconsets" + File /r "data\iconsets\dcraven" +SectionEnd + +Section "gnome" SecIconsetsGnome + SetOutPath "$INSTDIR\data\iconsets" + File /r "data\iconsets\gnome" +SectionEnd + +Section "goojim" SecIconsetsGoojim + SetOutPath "$INSTDIR\data\iconsets" + File /r "data\iconsets\goojim" +SectionEnd + +Section "gota" SecIconsetsGota + SetOutPath "$INSTDIR\data\iconsets" + File /r "data\iconsets\gota" +SectionEnd + +Section "jabberbulb" SecIconsetsJabberbulb + SetOutPath "$INSTDIR\data\iconsets" + File /r "data\iconsets\jabberbulb" +SectionEnd + +Section "sun" SecIconsetsSun + SetOutPath "$INSTDIR\data\iconsets" + File /r "data\iconsets\sun" +SectionEnd + +Section "wroop" SecIconsetsWroop + SetOutPath "$INSTDIR\data\iconsets" + File /r "data\iconsets\wroop" +SectionEnd + +Section "transports" SecIconsetsTransports + SetOutPath "$INSTDIR\data\iconsets" + File /r "data\iconsets\transports" + SectionIn Ro +SectionEnd + +SectionGroupEnd + +SectionGroup $(NAME_Languages) + +Section "English (UK)" SecLanguagesEnglishUK + SetOutPath "$INSTDIR\po" + File /r "po\en_GB" +SectionEnd + +Section "French" SecLanguagesFrench + SetOutPath "$INSTDIR\po" + File /r "po\fr" +SectionEnd + +Section "German" SecLanguagesGerman + SetOutPath "$INSTDIR\po" + File /r "po\de" +SectionEnd + +Section "Italian" SecLanguagesItalian + SetOutPath "$INSTDIR\po" + File /r "po\it" +SectionEnd + +Section "Spanish" SecLanguagesSpanish + SetOutPath "$INSTDIR\po" + File /r "po\es" +SectionEnd + +Section "Russian" SecLanguagesRussian + SetOutPath "$INSTDIR\po" + File /r "po\ru" +SectionEnd + +Section $(NAME_SecLanguagesOther) SecLanguagesOther + SetOutPath "$INSTDIR\po" + File /r "po\be" + File /r "po\be@latin" + File /r "po\bg" + File /r "po\br" + File /r "po\cs" + File /r "po\da" + File /r "po\el" + File /r "po\eo" + File /r "po\eu" + File /r "po\gl" + File /r "po\he" + File /r "po\hr" + File /r "po\lt" + File /r "po\nb" + File /r "po\nl" + File /r "po\no" + File /r "po\pl" + File /r "po\pt" + File /r "po\pt_BR" + File /r "po\sk" + File /r "po\sr" + File /r "po\sr@Latn" + File /r "po\sv" + File /r "po\uk" + File /r "po\zh_CN" +SectionEnd + +SectionGroupEnd + +!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN + !insertmacro MUI_DESCRIPTION_TEXT ${SecGajim} $(DESC_SecGajim) +!insertmacro MUI_FUNCTION_DESCRIPTION_END View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/30f8a76b4d2272daef42d3545bba5aa16…

1 0

[Git][gajim/gajim][gajim_0.16] Add 'common' to packages included in win build
by Philipp Hörist 08 Jan '17

08 Jan '17

Philipp Hörist pushed to branch gajim_0.16 at gajim / gajim Commits: a74fcd91 by Philipp Hörist at 2017-01-08T17:49:44+01:00 Add 'common' to packages included in win build Because demandimport is not used anymore cx_freeze doesnt add it to the build, this causes plugins that still import demandimport to fail - - - - - 1 changed file: - setup_win32.py Changes: ===================================== setup_win32.py ===================================== --- a/setup_win32.py +++ b/setup_win32.py @@ -36,7 +36,7 @@ options = { 'includes': ['win32com.server', 'win32com.client'], 'packages': ['pkg_resources', 'cffi', 'gtk', 'cryptography', 'Crypto', 'PIL', - 'axolotl', 'google'], + 'axolotl', 'google', 'common'], 'includes': ['new'], 'excludes': ['Tkinter', 'unittest', 'psutil'], } View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/a74fcd9190994620bcf90a61f99ffa103f…

1 0

[Git][gajim/gajim][master] 4 commits: Make dialogs.AboutDialog inherit directly from GtkAboutDialog.
by Philipp Hörist 08 Jan '17

08 Jan '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 2439a8b8 by Emmanuel Gil Peyrot at 2017-01-08T00:41:54+00:00 Make dialogs.AboutDialog inherit directly from GtkAboutDialog. - - - - - fd167974 by Emmanuel Gil Peyrot at 2017-01-08T00:41:54+00:00 Fix website URL (missing https:). - - - - - 553fd8f7 by Emmanuel Gil Peyrot at 2017-01-08T00:45:37+00:00 Add the actual GtkApplicationWindow to the GtkApplication. - - - - - 30f8a76b by Philipp Hörist at 2017-01-08T14:46:52+01:00 Merge branch 'gtk-application' into 'master' Misc simple GTK+ fixes. See merge request !24 - - - - - 3 changed files: - data/gui/roster_window.ui - src/dialogs.py - src/roster_window.py Changes: ===================================== data/gui/roster_window.ui ===================================== --- a/data/gui/roster_window.ui +++ b/data/gui/roster_window.ui @@ -3,7 +3,7 @@ <interface> <requires lib="gtk+" version="3.12"/> <object class="GtkAccelGroup" id="accelgroup1"/> - <object class="GtkWindow" id="roster_window"> + <object class="GtkApplicationWindow" id="roster_window"> <property name="width_request">85</property> <property name="height_request">200</property> <property name="can_focus">False</property> ===================================== src/dialogs.py ===================================== --- a/src/dialogs.py +++ b/src/dialogs.py @@ -1283,32 +1283,32 @@ class AddNewContactWindow: if obj.prompt: self.gateway_prompt[obj.jid]['prompt'] = obj.prompt -class AboutDialog: +class AboutDialog(Gtk.AboutDialog): """ Class for about dialog """ def __init__(self): - dlg = Gtk.AboutDialog() - dlg.set_transient_for(gajim.interface.roster.window) - dlg.set_name('Gajim') - dlg.set_version(gajim.version) + Gtk.AboutDialog.__init__(self) + self.set_transient_for(gajim.interface.roster.window) + self.set_name('Gajim') + self.set_version(gajim.version) s = 'Copyright © 2003-2014 Gajim Team' - dlg.set_copyright(s) + self.set_copyright(s) copying_file_path = self.get_path('COPYING') if copying_file_path: with open(copying_file_path) as a_file: text = a_file.read() - dlg.set_license(text) + self.set_license(text) gtk_ver = '%i.%i.%i' % (Gtk.get_major_version(), Gtk.get_minor_version(), Gtk.get_micro_version()) gobject_ver = self.tuple2str(GObject.pygobject_version) nbxmpp_ver = nbxmpp.__version__ - dlg.set_comments('%s\n%s %s\n%s %s\n%s %s' % (_('A GTK+ Jabber/XMPP client'), + self.set_comments('%s\n%s %s\n%s %s\n%s %s' % (_('A GTK+ Jabber/XMPP client'), _('GTK+ Version:'), gtk_ver, _('PyGobject Version:'), gobject_ver, _('python-nbxmpp Version:'), nbxmpp_ver)) - dlg.set_website('http://gajim.org/') + self.set_website('https://gajim.org/') authors_file_path = self.get_path('AUTHORS') if authors_file_path: @@ -1336,25 +1336,25 @@ class AboutDialog: 'thank all the package maintainers.') authors.append(text) - dlg.set_authors(authors) + self.set_authors(authors) - dlg.props.wrap_license = True + self.props.wrap_license = True pixbuf = gtkgui_helpers.get_icon_pixmap('gajim', 128) - dlg.set_logo(pixbuf) + self.set_logo(pixbuf) #here you write your name in the form Name FamilyName <someone@somewhere> - dlg.set_translator_credits(_('translator-credits')) + self.set_translator_credits(_('translator-credits')) thanks_artists_file_path = self.get_path('THANKS.artists') if thanks_artists_file_path: with open(thanks_artists_file_path) as a_file: artists_text = a_file.read() artists = artists_text.split('\n') - dlg.set_artists(artists) + self.set_artists(artists) - dlg.connect('response', self.on_response) - dlg.show_all() + self.connect('response', self.on_response) + self.show_all() def on_response(self, dialog, response_id): if response_id == Gtk.ResponseType.DELETE_EVENT: ===================================== src/roster_window.py ===================================== --- a/src/roster_window.py +++ b/src/roster_window.py @@ -94,7 +94,7 @@ empty_pixbuf = GdkPixbuf.Pixbuf.new(GdkPixbuf.Colorspace.RGB, True, 8, 1, 1) empty_pixbuf.fill(0xffffff00) -class RosterWindow(Gtk.ApplicationWindow): +class RosterWindow: """ Class for main window of the GTK+ interface """ @@ -6178,7 +6178,7 @@ class RosterWindow(Gtk.ApplicationWindow): ### ################################################################################ - def __init__(self, app): + def __init__(self, app: Gtk.Application): self.application = app self.filtering = False self.starting = False @@ -6195,8 +6195,8 @@ class RosterWindow(Gtk.ApplicationWindow): GdkPixbuf.Pixbuf, GdkPixbuf.Pixbuf] self.xml = gtkgui_helpers.get_gtk_builder('roster_window.ui') self.window = self.xml.get_object('roster_window') + app.add_window(self.window) self.hpaned = self.xml.get_object('roster_hpaned') - self.window.set_application(app) gajim.interface.msg_win_mgr = MessageWindowMgr(self.window, self.hpaned) gajim.interface.msg_win_mgr.connect('window-delete', self.on_message_window_delete) View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/f8a314b5f242f9201c1b7c0fc0f6c2649…

1 0

[Git][gajim/gajim][master] 2 commits: Port ExceptionHook to GTK3
by Philipp Hörist 07 Jan '17

07 Jan '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: aa50acd1 by Philipp Hörist at 2017-01-07T21:07:53+01:00 Port ExceptionHook to GTK3 - - - - - f8a314b5 by Philipp Hörist at 2017-01-07T22:36:09+01:00 Merge branch 'dev' into 'master' ExceptionHook port to GTK3 See merge request !25 - - - - - 3 changed files: - + data/gui/exception_dialog.ui - src/application.py - src/gtkexcepthook.py Changes: ===================================== data/gui/exception_dialog.ui ===================================== --- /dev/null +++ b/data/gui/exception_dialog.ui @@ -0,0 +1,139 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<interface> + <requires lib="gtk+" version="3.12"/> + <object class="GtkDialog" id="ExceptionDialog"> + <property name="can_focus">False</property> + <property name="title" translatable="yes">Exception</property> + <property name="window_position">center</property> + <property name="icon_name">dialog-error</property> + <property name="type_hint">dialog</property> + <property name="gravity">center</property> + <child internal-child="vbox"> + <object class="GtkBox" id="dialog-vbox"> + <property name="can_focus">False</property> + <property name="margin_left">12</property> + <property name="margin_right">12</property> + <property name="margin_top">12</property> + <property name="margin_bottom">13</property> + <property name="orientation">vertical</property> + <property name="spacing">2</property> + <child internal-child="action_area"> + <object class="GtkButtonBox" id="dialog-action_area"> + <property name="can_focus">False</property> + <property name="margin_top">5</property> + <property name="layout_style">end</property> + <child> + <object class="GtkButton" id="close_btn"> + <property name="label">gtk-close</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="use_stock">True</property> + <property name="always_show_image">True</property> + <signal name="clicked" handler="on_close_clicked" swapped="no"/> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkButton" id="report_btn"> + <property name="label" translatable="yes">Report Bug</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <signal name="clicked" handler="on_report_clicked" swapped="no"/> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkGrid" id="grid"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="row_spacing">20</property> + <property name="column_spacing">20</property> + <child> + <object class="GtkImage" id="image"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="stock">gtk-dialog-error</property> + <property name="icon_size">6</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="msglabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="valign">center</property> + <property name="hexpand">True</property> + <property name="label" translatable="yes">A programming error has been detected. +It probably is not fatal, but should be reported +to the developers nonetheless.</property> + <property name="max_width_chars">60</property> + <property name="lines">3</property> + <attributes> + <attribute name="font-desc" value="<Geben Sie den Wert ein> 12"/> + </attributes> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkScrolledWindow" id="scrolledwindow"> + <property name="height_request">150</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="vexpand">True</property> + <property name="shadow_type">in</property> + <child> + <object class="GtkTextView" id="exception_view"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + <property name="editable">False</property> + <property name="left_margin">4</property> + <property name="right_margin">4</property> + <property name="accepts_tab">False</property> + </object> + </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + <property name="width">2</property> + </packing> + </child> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + </child> + </object> +</interface> ===================================== src/application.py ===================================== --- a/src/application.py +++ b/src/application.py @@ -94,6 +94,9 @@ class GajimApplication(Gtk.Application): Gtk.Application.do_activate(self) + import gtkexcepthook + gtkexcepthook.init() + # Create and initialize Application Paths & Databases import common.configpaths common.configpaths.gajimpaths.init( ===================================== src/gtkexcepthook.py ===================================== --- a/src/gtkexcepthook.py +++ b/src/gtkexcepthook.py @@ -1,6 +1,7 @@ # -*- coding:utf-8 -*- ## src/gtkexcepthook.py ## +## Copyright (C) 2016 Philipp Hörist <philipp AT hoerist.com> ## Copyright (C) 2005-2006 Nikos Kouremenos <kourem AT gmail.com> ## Copyright (C) 2005-2014 Yann Leboulanger <asterix AT lagaule.org> ## Copyright (C) 2008 Stephan Erb <steve-e AT h3c.de> @@ -24,83 +25,61 @@ import sys import os import traceback import threading +import webbrowser +import gi +gi.require_version('Gtk', '3.0') from gi.repository import Gtk -from gi.repository import Gdk -from gi.repository import Pango -from common import i18n # installs _() function -from dialogs import HigDialog - from io import StringIO -from common import helpers +from common import configpaths + +glade_file = os.path.join(configpaths.get('GUI'), 'exception_dialog.ui') _exception_in_progress = threading.Lock() -def _info(type_, value, tb): + +def _hook(type_, value, tb): if not _exception_in_progress.acquire(False): # Exceptions have piled up, so we use the default exception # handler for such exceptions - _excepthook_save(type_, value, tb) + sys.__excepthook__(type_, value, tb) return - dialog = HigDialog(None, Gtk.MessageType.WARNING, Gtk.ButtonsType.NONE, - _('A programming error has been detected'), - _('It probably is not fatal, but should be reported ' - 'to the developers nonetheless.')) + ExceptionDialog(type_, value, tb) + _exception_in_progress.release() - dialog.set_modal(False) - #FIXME: add icon to this button - RESPONSE_REPORT_BUG = 42 - dialog.add_buttons(Gtk.STOCK_CLOSE, Gtk.ButtonsType.CLOSE, - _('_Report Bug'), RESPONSE_REPORT_BUG) - report_button = dialog.action_area.get_children()[0] # right to left - report_button.grab_focus() - # Details - textview = Gtk.TextView() - textview.set_editable(False) - textview.override_font(Pango.FontDescription('Monospace')) - sw = Gtk.ScrolledWindow() - sw.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC) - sw.add(textview) - frame = Gtk.Frame() - frame.set_shadow_type(Gtk.ShadowType.IN) - frame.add(sw) - frame.set_border_width(6) - textbuffer = textview.get_buffer() - trace = StringIO() - traceback.print_exception(type_, value, tb, None, trace) - textbuffer.set_text(trace.getvalue()) - textview.set_size_request( - Gdk.Screen.width() / 3, - Gdk.Screen.height() / 4) - expander = Gtk.Expander(label=_('Details')) - expander.add(frame) - dialog.vbox.pack_start(expander, True, True, 0) +class ExceptionDialog(): + def __init__(self, type_, value, tb): + builder = Gtk.Builder() + builder.add_from_file(glade_file) + self.dialog = builder.get_object("ExceptionDialog") + builder.connect_signals(self) + builder.get_object("report_btn").grab_focus() + self.exception_view = builder.get_object("exception_view") + buffer_ = self.exception_view.get_buffer() + trace = StringIO() + traceback.print_exception(type_, value, tb, None, trace) + buffer_.set_text(trace.getvalue()) + self.exception_view.set_editable(False) + self.dialog.run() - dialog.set_resizable(True) - # on expand the details the dialog remains centered on screen - dialog.set_position(Gtk.WindowPosition.CENTER_ALWAYS) + def on_report_clicked(self, *args): + url = 'https://dev.gajim.org/gajim/gajim/issues' + webbrowser.open(url, new=2) - def on_dialog_response(dialog, response): - if response == RESPONSE_REPORT_BUG: - url = 'http://trac.gajim.org/wiki/HowToCreateATicket' - helpers.launch_browser_mailer('url', url) - else: - dialog.destroy() - dialog.connect('response', on_dialog_response) - dialog.show_all() + def on_close_clicked(self, *args): + self.dialog.destroy() - _exception_in_progress.release() -# gdb/kdm etc if we use startx this is not True -if os.name == 'nt' or not sys.stderr.isatty(): - #FIXME: maybe always show dialog? - _excepthook_save = sys.excepthook - sys.excepthook = _info +def init(): + # gdb/kdm etc if we use startx this is not True + if os.name == 'nt' or not sys.stderr.isatty(): + # FIXME: maybe always show dialog? + sys.excepthook = _hook # this is just to assist testing (python gtkexcepthook.py) if __name__ == '__main__': - _excepthook_save = sys.excepthook - sys.excepthook = _info + init() + print(sys.version) raise Exception() View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/e967d4ed774e1d7f839c20abdc795cbbd…

1 0

[Git][gajim/gajim][master] 7 commits: Make some paths available before profile init
by Philipp Hörist 07 Jan '17

07 Jan '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: c4e41d69 by Philipp Hörist at 2017-01-06T20:01:13+01:00 Make some paths available before profile init - - - - - 5af42e47 by Philipp Hörist at 2017-01-06T20:01:14+01:00 Remove old svn code - - - - - 52657e7f by Philipp Hörist at 2017-01-06T20:03:43+01:00 Remove unicode conversion method for paths its not needed in python3 - tempfile.gettempdir() returns always unicode - os.environ.get() returns always unicode we get what we put into: - os.path.expanduser() - - - - - 8079930d by Philipp Hörist at 2017-01-06T20:04:22+01:00 Add get() function to configpaths - - - - - 6d26553b by Philipp Hörist at 2017-01-06T20:04:23+01:00 Dont windowsify non-config directorys - - - - - 8c01d4d4 by Philipp Hörist at 2017-01-06T20:04:23+01:00 Add GUI folder to configpaths - - - - - e967d4ed by Philipp Hörist at 2017-01-07T19:36:13+01:00 Merge branch 'dev' into 'master' Improvements for Configpaths See merge request !22 - - - - - 2 changed files: - src/common/check_paths.py - src/common/configpaths.py Changes: ===================================== src/common/check_paths.py ===================================== --- a/src/common/check_paths.py +++ b/src/common/check_paths.py @@ -130,9 +130,7 @@ def split_db(): print('spliting database') if os.name == 'nt': try: - import configpaths - OLD_LOG_DB_FOLDER = os.path.join(configpaths.fse( - os.environ['appdata']), 'Gajim') + OLD_LOG_DB_FOLDER = os.path.join(os.environ['appdata'], 'Gajim') except KeyError: OLD_LOG_DB_FOLDER = '.' else: @@ -187,8 +185,7 @@ def check_and_possibly_move_config(): if os.name == 'nt': try: - OLD_LOG_DB_FOLDER = os.path.join(configpaths.fse( - os.environ['appdata']), 'Gajim') + OLD_LOG_DB_FOLDER = os.path.join(os.environ['appdata'], 'Gajim') except KeyError: OLD_LOG_DB_FOLDER = '.' else: ===================================== src/common/configpaths.py ===================================== --- a/src/common/configpaths.py +++ b/src/common/configpaths.py @@ -52,17 +52,17 @@ TYPE_DATA # just leave it as is. Since these paths are meant to be internal to Gajim and # not displayed to the user, Unicode is not really necessary here. -def fse(s): - """ - Convert from filesystem encoding if not already Unicode - """ - return s def windowsify(s): if os.name == 'nt': return s.capitalize() return s + +def get(key): + return gajimpaths[key] + + class ConfigPaths: def __init__(self): # {'name': (type, path), } type can be TYPE_CONFIG, TYPE_CACHE, TYPE_DATA @@ -77,7 +77,7 @@ class ConfigPaths: # variable 'appdata' is in? Assuming it to be in filesystem # encoding. self.config_root = self.cache_root = self.data_root = \ - os.path.join(fse(os.environ['appdata']), 'Gajim') + os.path.join(os.environ['appdata'], 'Gajim') except KeyError: # win9x, in cwd self.config_root = self.cache_root = self.data_root = '.' @@ -97,6 +97,13 @@ class ConfigPaths: base = expand('~/.local/share') self.data_root = os.path.join(base, 'gajim') + basedir = os.environ.get('GAJIM_BASEDIR', defs.basedir) + self.add('DATA', None, os.path.join(basedir, 'data')) + self.add('GUI', None, os.path.join(basedir, 'data', 'gui')) + self.add('ICONS', None, os.path.join(basedir, 'icons')) + self.add('HOME', None, os.path.expanduser('~')) + self.add('PLUGINS_BASE', None, os.path.join(basedir, 'plugins')) + def add(self, name, type_, path): self.paths[name] = (type_, path) @@ -125,12 +132,12 @@ class ConfigPaths: self.config_root = self.cache_root = self.data_root = root self.init_profile(profile) - + if len(profile) > 0 and profile_separation: profile = u'.' + profile else: profile = '' - + d = {'LOG_DB': 'logs.db', 'MY_CACERTS': 'cacerts.pem', 'MY_EMOTS': 'emoticons', 'MY_ICONSETS': 'iconsets', 'MY_MOOD_ICONSETS': 'moods', 'MY_ACTIVITY_ICONSETS': 'activities', @@ -159,24 +166,12 @@ class ConfigPaths: else: self.add('MY_CONFIG', TYPE_CONFIG, '') - basedir = fse(os.environ.get('GAJIM_BASEDIR', defs.basedir)) - self.add('DATA', None, os.path.join(basedir, windowsify('data'))) - self.add('ICONS', None, os.path.join(basedir, windowsify('icons'))) - self.add('HOME', None, fse(os.path.expanduser('~'))) - self.add('PLUGINS_BASE', None, os.path.join(basedir, - windowsify('plugins'))) try: - self.add('TMP', None, fse(tempfile.gettempdir())) + self.add('TMP', None, tempfile.gettempdir()) except IOError as e: print('Error opening tmp folder: %s\nUsing %s' % (str(e), os.path.expanduser('~')), file=sys.stderr) - self.add('TMP', None, fse(os.path.expanduser('~'))) - - try: - import svn_config - svn_config.configure(self) - except (ImportError, AttributeError): - pass + self.add('TMP', None, os.path.expanduser('~')) def init_profile(self, profile): conffile = windowsify('config') View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/996bb2abca9844d54f1d33141a727c8e7…

1 0

[Git][gajim/gajim][master] 2 commits: Remove an extraneous GtkBox in groupchat_control.
by Philipp Hörist 07 Jan '17

07 Jan '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 5a976f86 by Emmanuel Gil Peyrot at 2017-01-07T17:50:06+00:00 Remove an extraneous GtkBox in groupchat_control. - - - - - 996bb2ab by Philipp Hörist at 2017-01-07T19:33:08+01:00 Merge branch 'emoticons-fix' into 'master' Remove an extraneous GtkBox in groupchat_control See merge request !23 - - - - - 1 changed file: - data/gui/groupchat_control.ui Changes: ===================================== data/gui/groupchat_control.ui ===================================== --- a/data/gui/groupchat_control.ui +++ b/data/gui/groupchat_control.ui @@ -184,32 +184,21 @@ <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="GtkBox" id="hbox3023"> + <object class="GtkButton" id="emoticons_button"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can_focus">True</property> + <property name="receives_default">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="has_tooltip">True</property> + <property name="tooltip_text" translatable="yes">Show a list of emoticons (Alt+M)</property> + <property name="relief">none</property> <child> - <object class="GtkButton" id="emoticons_button"> + <object class="GtkImage" id="emoticons_button_image"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">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="has_tooltip">True</property> - <property name="tooltip_text" translatable="yes">Show a list of emoticons (Alt+M)</property> - <property name="relief">none</property> - <child> - <object class="GtkImage" id="emoticons_button_image"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="stock">gtk-missing-image</property> - <property name="icon_size">1</property> - </object> - </child> + <property name="can_focus">False</property> + <property name="stock">gtk-missing-image</property> + <property name="icon_size">1</property> </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> </child> </object> <packing> View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/277e13bdd8b6a7d9c81e7f9f2a9d327dc…

1 0

[Git][gajim/gajim] Pushed new tag gajim-0.16.4
by Yann Leboulanger 06 Jan '17

06 Jan '17

Yann Leboulanger pushed new tag gajim-0.16.4 at gajim / gajim

1 0

[Git][gajim/gajim] Pushed new tag gajim-0.16.5
by Yann Leboulanger 06 Jan '17

06 Jan '17

Yann Leboulanger pushed new tag gajim-0.16.5 at gajim / gajim

1 0

[Git][gajim/gajim] Pushed new tag gajim-0.16.6
by Yann Leboulanger 06 Jan '17

06 Jan '17

Yann Leboulanger pushed new tag gajim-0.16.6 at gajim / gajim

1 0

[Git][gajim/gajim] Pushed new tag gajim-0.16.1
by Yann Leboulanger 06 Jan '17

06 Jan '17

Yann Leboulanger pushed new tag gajim-0.16.1 at gajim / gajim

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits