diff -Nru dayjournal-22.2.5/configure dayjournal-22.3.0/configure --- dayjournal-22.2.5/configure 2014-04-10 22:01:57.000000000 +0000 +++ dayjournal-22.3.0/configure 2014-11-21 02:26:09.000000000 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for dayjournal 22.2.5. +# Generated by GNU Autoconf 2.68 for dayjournal 22.3.0. # # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -627,8 +627,8 @@ # Identity of this package. PACKAGE_NAME='dayjournal' PACKAGE_TARNAME='dayjournal' -PACKAGE_VERSION='22.2.5' -PACKAGE_STRING='dayjournal 22.2.5' +PACKAGE_VERSION='22.3.0' +PACKAGE_STRING='dayjournal 22.3.0' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -1359,7 +1359,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures dayjournal 22.2.5 to adapt to many kinds of systems. +\`configure' configures dayjournal 22.3.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1429,7 +1429,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of dayjournal 22.2.5:";; + short | recursive ) echo "Configuration of dayjournal 22.3.0:";; esac cat <<\_ACEOF @@ -1541,7 +1541,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -dayjournal configure 22.2.5 +dayjournal configure 22.3.0 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -1819,7 +1819,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by dayjournal $as_me 22.2.5, which was +It was created by dayjournal $as_me 22.3.0, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -2638,7 +2638,7 @@ # Define the identity of the package. PACKAGE='dayjournal' - VERSION='22.2.5' + VERSION='22.3.0' cat >>confdefs.h <<_ACEOF @@ -12117,7 +12117,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by dayjournal $as_me 22.2.5, which was +This file was extended by dayjournal $as_me 22.3.0, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -12183,7 +12183,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -dayjournal config.status 22.2.5 +dayjournal config.status 22.3.0 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" diff -Nru dayjournal-22.2.5/configure.ac dayjournal-22.3.0/configure.ac --- dayjournal-22.2.5/configure.ac 2014-04-10 22:01:48.000000000 +0000 +++ dayjournal-22.3.0/configure.ac 2014-11-21 02:25:56.000000000 +0000 @@ -1,7 +1,7 @@ dnl Process this file with autoconf to produce a configure script. dnl Created by Anjuta application wizard. -AC_INIT(dayjournal, 22.2.5) +AC_INIT(dayjournal, 22.3.0) AC_CONFIG_HEADERS([config.h]) diff -Nru dayjournal-22.2.5/debian/changelog dayjournal-22.3.0/debian/changelog --- dayjournal-22.2.5/debian/changelog 2014-11-17 02:10:25.000000000 +0000 +++ dayjournal-22.3.0/debian/changelog 2014-11-21 02:29:41.000000000 +0000 @@ -1,6 +1,6 @@ -dayjournal (22.2.5-2) trusty; urgency=low +dayjournal (22.3.0-2) trusty; urgency=low * Overview of Changes - - Creating archive now also creates monthly archive files. + - Add option to set entry font in settings menu. - -- Zach Burnham Sun, 16 Nov 2014 21:07:48 -0500 \ No newline at end of file + -- Zach Burnham Thu, 20 Nov 2014 21:28:08 -0500 \ No newline at end of file diff -Nru dayjournal-22.2.5/debian/manpage.1.ex dayjournal-22.3.0/debian/manpage.1.ex --- dayjournal-22.2.5/debian/manpage.1.ex 2014-11-17 02:07:49.000000000 +0000 +++ dayjournal-22.3.0/debian/manpage.1.ex 2014-11-21 02:28:09.000000000 +0000 @@ -2,7 +2,7 @@ .\" First parameter, NAME, should be all caps .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection .\" other parameters are allowed: see man(7), man(1) -.TH DAYJOURNAL SECTION "November 16, 2014" +.TH DAYJOURNAL SECTION "November 20, 2014" .\" Please adjust this date whenever revising the manpage. .\" .\" Some roff macros, for reference: diff -Nru dayjournal-22.2.5/debian/manpage.sgml.ex dayjournal-22.3.0/debian/manpage.sgml.ex --- dayjournal-22.2.5/debian/manpage.sgml.ex 2014-11-17 02:07:49.000000000 +0000 +++ dayjournal-22.3.0/debian/manpage.sgml.ex 2014-11-21 02:28:09.000000000 +0000 @@ -20,7 +20,7 @@ FIRSTNAME"> SURNAME"> - November 16, 2014"> + November 20, 2014"> SECTION"> diff -Nru dayjournal-22.2.5/debian/README.Debian dayjournal-22.3.0/debian/README.Debian --- dayjournal-22.2.5/debian/README.Debian 2014-11-17 02:07:49.000000000 +0000 +++ dayjournal-22.3.0/debian/README.Debian 2014-11-21 02:28:09.000000000 +0000 @@ -3,4 +3,4 @@ - -- Zach Burnham Sun, 16 Nov 2014 21:07:48 -0500 + -- Zach Burnham Thu, 20 Nov 2014 21:28:08 -0500 diff -Nru dayjournal-22.2.5/src/dayjournal.c dayjournal-22.3.0/src/dayjournal.c --- dayjournal-22.2.5/src/dayjournal.c 2014-11-17 02:06:13.000000000 +0000 +++ dayjournal-22.3.0/src/dayjournal.c 2014-11-21 02:14:34.000000000 +0000 @@ -27,12 +27,12 @@ #include #include #include +#include #include #include #include #include #include -#include #include @@ -69,13 +69,13 @@ #define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL))) #define _g_free0(var) (var = (g_free (var), NULL)) typedef struct _Block1Data Block1Data; +#define _pango_font_description_free0(var) ((var == NULL) ? NULL : (var = (pango_font_description_free (var), NULL))) typedef struct _Block2Data Block2Data; typedef struct _Block3Data Block3Data; #define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL))) typedef struct _main_callSaveData main_callSaveData; typedef struct _main_seldomSaveData main_seldomSaveData; #define _g_date_time_unref0(var) ((var == NULL) ? NULL : (var = (g_date_time_unref (var), NULL))) -#define _pango_font_description_free0(var) ((var == NULL) ? NULL : (var = (pango_font_description_free (var), NULL))) typedef struct _main_markEntryDaysOnCalendarData main_markEntryDaysOnCalendarData; typedef struct _main_getDaysToMarkData main_getDaysToMarkData; @@ -115,7 +115,6 @@ JournalEditor* editor; JournalEntry* entry; GtkTextView* entryTextView; - gint fontSize; gboolean isOpening; gboolean needsSave; gboolean entryLocked; @@ -326,16 +325,17 @@ static void main_decreaseCalendarFontSize (Main* self); static void ___lambda20__gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self); static void __lambda21_ (Main* self); -static void main_menuKeyboardShortcutsClicked (Main* self); +static void main_chooseFont (Main* self); static void ___lambda21__gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self); static void __lambda22_ (Main* self); -static void main_menuAboutClicked (Main* self); +static void main_menuKeyboardShortcutsClicked (Main* self); static void ___lambda22__gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self); static void __lambda23_ (Main* self); -static void ___lambda23__gtk_tool_button_clicked (GtkToolButton* _sender, gpointer self); -static void main_setOpenJournalsMenuItems (Main* self); +static void main_menuAboutClicked (Main* self); +static void ___lambda23__gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self); static void __lambda24_ (Main* self); static void ___lambda24__gtk_tool_button_clicked (GtkToolButton* _sender, gpointer self); +static void main_setOpenJournalsMenuItems (Main* self); static void __lambda25_ (Main* self); static void ___lambda25__gtk_tool_button_clicked (GtkToolButton* _sender, gpointer self); static void __lambda26_ (Main* self); @@ -343,44 +343,47 @@ static void __lambda27_ (Main* self); static void ___lambda27__gtk_tool_button_clicked (GtkToolButton* _sender, gpointer self); static void __lambda28_ (Main* self); -static void ___lambda28__gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self); +static void ___lambda28__gtk_tool_button_clicked (GtkToolButton* _sender, gpointer self); static void __lambda29_ (Main* self); static void ___lambda29__gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self); static void __lambda30_ (Main* self); static void ___lambda30__gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self); static void __lambda31_ (Main* self); -#define JOURNAL_ARCHIVER_TYPE_TEXT "txt" static void ___lambda31__gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self); static void __lambda32_ (Main* self); +#define JOURNAL_ARCHIVER_TYPE_TEXT "txt" static void ___lambda32__gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self); -static void __lambda33_ (Block1Data* _data1_); -static void ___lambda33__gtk_check_menu_item_toggled (GtkCheckMenuItem* _sender, gpointer self); -static void __lambda34_ (Main* self); -static void ___lambda34__gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self); +static void __lambda33_ (Main* self); +static void ___lambda33__gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self); +static void __lambda34_ (Block1Data* _data1_); +static void ___lambda34__gtk_check_menu_item_toggled (GtkCheckMenuItem* _sender, gpointer self); static void __lambda35_ (Main* self); static void ___lambda35__gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self); static void __lambda36_ (Main* self); -static void ___lambda36__gtk_tool_button_clicked (GtkToolButton* _sender, gpointer self); +static void ___lambda36__gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self); static void __lambda37_ (Main* self); +static void ___lambda37__gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self); +static void __lambda38_ (Main* self); +static void ___lambda38__gtk_tool_button_clicked (GtkToolButton* _sender, gpointer self); +static void __lambda39_ (Main* self); void main_onTextChanged (Main* self, GtkTextBuffer* buffer); -static void ___lambda37__gtk_text_buffer_changed (GtkTextBuffer* _sender, gpointer self); +static void ___lambda39__gtk_text_buffer_changed (GtkTextBuffer* _sender, gpointer self); JournalEditor* journal_editor_new (GtkTextBuffer* buffer); JournalEditor* journal_editor_construct (GType object_type, GtkTextBuffer* buffer); -static void __lambda38_ (Block1Data* _data1_); +static void __lambda40_ (Block1Data* _data1_); void main_btnTodayClicked (Main* self, GtkButton* button); -static void ___lambda38__gtk_button_clicked (GtkButton* _sender, gpointer self); +static void ___lambda40__gtk_button_clicked (GtkButton* _sender, gpointer self); static void main_resetCalendarFont (Main* self); -static void __lambda39_ (Main* self); +static void __lambda41_ (Main* self); void main_daySelected (Main* self); -static void ___lambda39__gtk_calendar_day_selected (GtkCalendar* _sender, gpointer self); +static void ___lambda41__gtk_calendar_day_selected (GtkCalendar* _sender, gpointer self); static void main_setDjDirLocationMenuLabel (Main* self); -gint user_data_get_fontSize (void); -static void main_resetFontSize (Main* self); -static gboolean __lambda40_ (Main* self, GtkWidget* window, GdkEventKey* event); +const gchar* user_data_get_fontString (void); +static gboolean __lambda42_ (Main* self, GtkWidget* window, GdkEventKey* event); gboolean main_onKeyPress (Main* self, GdkEventKey* key); -static gboolean ___lambda40__gtk_widget_key_press_event (GtkWidget* _sender, GdkEventKey* event, gpointer self); -static void __lambda41_ (Main* self); -static void ___lambda41__gtk_widget_destroy (GtkWidget* _sender, gpointer self); +static gboolean ___lambda42__gtk_widget_key_press_event (GtkWidget* _sender, GdkEventKey* event, gpointer self); +static void __lambda43_ (Main* self); +static void ___lambda43__gtk_widget_destroy (GtkWidget* _sender, gpointer self); static void main_loadBlips (Main* self); static void main_goToTodaysEntry (Main* self); static void main_addImageNow (Main* self, const gchar* imgFilePath); @@ -431,7 +434,6 @@ void journal_entry_saveEntryFileNonAsync (JournalEntry* self, const gchar* entryText, GError** error); gchar* journal_editor_getText (JournalEditor* self); void user_data_saveWindowSize (gint width, gint height); -void user_data_saveFontSize (gint size); void user_data_saveCalendarFontSize (gint size); static gint main_getCalendarFontSize (Main* self); JournalEntry* journal_entry_new (gint year, gint month, gint day); @@ -448,9 +450,12 @@ void journal_editor_prependDateToEntry (JournalEditor* self, const gchar* dateHeading); gchar* journal_entry_getEntryDateHeading (JournalEntry* self); static void main_tryInsertEntrySection (Main* self); +static void main_clearFontPrefs (Main* self); void journal_editor_insertAtCursor (JournalEditor* self, const gchar* text); gchar* user_data_getNewEntrySectionText (void); +static gint main_getFontSize (Main* self); static void main_changeFontSize (Main* self, gint byThisMuch); +void user_data_setFont (const gchar* fontStr); static void main_markEntryDaysOnCalendar_data_free (gpointer _data); static gboolean main_markEntryDaysOnCalendar_co (main_markEntryDaysOnCalendarData* _data_); static void main_getDaysToMark (Main* self, gint year, gint month, GAsyncReadyCallback _callback_, gpointer _user_data_); @@ -647,7 +652,7 @@ static void __lambda21_ (Main* self) { - main_menuKeyboardShortcutsClicked (self); + main_chooseFont (self); } @@ -657,7 +662,7 @@ static void __lambda22_ (Main* self) { - main_menuAboutClicked (self); + main_menuKeyboardShortcutsClicked (self); } @@ -666,23 +671,23 @@ } -static gpointer _g_object_ref0 (gpointer self) { - return self ? g_object_ref (self) : NULL; +static void __lambda23_ (Main* self) { + main_menuAboutClicked (self); } -static void __lambda23_ (Main* self) { - main_menuChangeDjDirClicked (self); +static void ___lambda23__gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) { + __lambda23_ (self); } -static void ___lambda23__gtk_tool_button_clicked (GtkToolButton* _sender, gpointer self) { - __lambda23_ (self); +static gpointer _g_object_ref0 (gpointer self) { + return self ? g_object_ref (self) : NULL; } static void __lambda24_ (Main* self) { - main_unlockEntry (self); + main_menuChangeDjDirClicked (self); } @@ -692,7 +697,7 @@ static void __lambda25_ (Main* self) { - main_chooseImage (self); + main_unlockEntry (self); } @@ -702,7 +707,7 @@ static void __lambda26_ (Main* self) { - main_increaseFontSize (self); + main_chooseImage (self); } @@ -712,7 +717,7 @@ static void __lambda27_ (Main* self) { - main_decreaseFontSize (self); + main_increaseFontSize (self); } @@ -722,17 +727,17 @@ static void __lambda28_ (Main* self) { - main_menuKeyboardShortcutsClicked (self); + main_decreaseFontSize (self); } -static void ___lambda28__gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) { +static void ___lambda28__gtk_tool_button_clicked (GtkToolButton* _sender, gpointer self) { __lambda28_ (self); } static void __lambda29_ (Main* self) { - main_menuAboutClicked (self); + main_menuKeyboardShortcutsClicked (self); } @@ -742,7 +747,7 @@ static void __lambda30_ (Main* self) { - main_createCompleteJournalArchive (self, JOURNAL_ARCHIVER_TYPE_HTML); + main_menuAboutClicked (self); } @@ -752,7 +757,7 @@ static void __lambda31_ (Main* self) { - main_createCompleteJournalArchive (self, JOURNAL_ARCHIVER_TYPE_TEXT); + main_createCompleteJournalArchive (self, JOURNAL_ARCHIVER_TYPE_HTML); } @@ -762,7 +767,7 @@ static void __lambda32_ (Main* self) { - main_menuOpenDjLocationClicked (self); + main_createCompleteJournalArchive (self, JOURNAL_ARCHIVER_TYPE_TEXT); } @@ -771,32 +776,32 @@ } -static void __lambda33_ (Block1Data* _data1_) { - Main * self; - GtkCheckMenuItem* _tmp0_; - self = _data1_->self; - _tmp0_ = _data1_->menuLockPastEntries; - main_menuLockPastEntriesToggled (self, _tmp0_); +static void __lambda33_ (Main* self) { + main_menuOpenDjLocationClicked (self); } -static void ___lambda33__gtk_check_menu_item_toggled (GtkCheckMenuItem* _sender, gpointer self) { +static void ___lambda33__gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) { __lambda33_ (self); } -static void __lambda34_ (Main* self) { - main_increaseCalendarFontSize (self); +static void __lambda34_ (Block1Data* _data1_) { + Main * self; + GtkCheckMenuItem* _tmp0_; + self = _data1_->self; + _tmp0_ = _data1_->menuLockPastEntries; + main_menuLockPastEntriesToggled (self, _tmp0_); } -static void ___lambda34__gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) { +static void ___lambda34__gtk_check_menu_item_toggled (GtkCheckMenuItem* _sender, gpointer self) { __lambda34_ (self); } static void __lambda35_ (Main* self) { - main_decreaseCalendarFontSize (self); + main_increaseCalendarFontSize (self); } @@ -806,16 +811,36 @@ static void __lambda36_ (Main* self) { - main_menuAboutClicked (self); + main_decreaseCalendarFontSize (self); } -static void ___lambda36__gtk_tool_button_clicked (GtkToolButton* _sender, gpointer self) { +static void ___lambda36__gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) { __lambda36_ (self); } static void __lambda37_ (Main* self) { + main_chooseFont (self); +} + + +static void ___lambda37__gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) { + __lambda37_ (self); +} + + +static void __lambda38_ (Main* self) { + main_menuAboutClicked (self); +} + + +static void ___lambda38__gtk_tool_button_clicked (GtkToolButton* _sender, gpointer self) { + __lambda38_ (self); +} + + +static void __lambda39_ (Main* self) { GtkTextView* _tmp0_; GtkTextBuffer* _tmp1_; GtkTextBuffer* _tmp2_; @@ -826,12 +851,12 @@ } -static void ___lambda37__gtk_text_buffer_changed (GtkTextBuffer* _sender, gpointer self) { - __lambda37_ (self); +static void ___lambda39__gtk_text_buffer_changed (GtkTextBuffer* _sender, gpointer self) { + __lambda39_ (self); } -static void __lambda38_ (Block1Data* _data1_) { +static void __lambda40_ (Block1Data* _data1_) { Main * self; GtkButton* _tmp0_; self = _data1_->self; @@ -840,22 +865,22 @@ } -static void ___lambda38__gtk_button_clicked (GtkButton* _sender, gpointer self) { - __lambda38_ (self); +static void ___lambda40__gtk_button_clicked (GtkButton* _sender, gpointer self) { + __lambda40_ (self); } -static void __lambda39_ (Main* self) { +static void __lambda41_ (Main* self) { main_daySelected (self); } -static void ___lambda39__gtk_calendar_day_selected (GtkCalendar* _sender, gpointer self) { - __lambda39_ (self); +static void ___lambda41__gtk_calendar_day_selected (GtkCalendar* _sender, gpointer self) { + __lambda41_ (self); } -static gboolean __lambda40_ (Main* self, GtkWidget* window, GdkEventKey* event) { +static gboolean __lambda42_ (Main* self, GtkWidget* window, GdkEventKey* event) { gboolean result = FALSE; GdkEventKey _tmp0_; gboolean _tmp1_ = FALSE; @@ -868,20 +893,20 @@ } -static gboolean ___lambda40__gtk_widget_key_press_event (GtkWidget* _sender, GdkEventKey* event, gpointer self) { +static gboolean ___lambda42__gtk_widget_key_press_event (GtkWidget* _sender, GdkEventKey* event, gpointer self) { gboolean result; - result = __lambda40_ (self, _sender, event); + result = __lambda42_ (self, _sender, event); return result; } -static void __lambda41_ (Main* self) { +static void __lambda43_ (Main* self) { main_on_destroy (self); } -static void ___lambda41__gtk_widget_destroy (GtkWidget* _sender, gpointer self) { - __lambda41_ (self); +static void ___lambda43__gtk_widget_destroy (GtkWidget* _sender, gpointer self) { + __lambda43_ (self); } @@ -973,261 +998,275 @@ GtkMenuItem* _tmp76_; GtkMenuItem* menuDecreaseCalendarFontSize; GtkMenuItem* _tmp77_; - GtkMenu* _tmp78_; + GtkMenuItem* _tmp78_; GtkMenuItem* _tmp79_; - GtkMenu* _tmp80_; - GtkMenuItem* _tmp81_; - GtkMenu* _tmp82_; - GtkMenuItem* _tmp83_; - GtkMenu* _tmp84_; - GtkSeparatorMenuItem* _tmp85_; - GtkSeparatorMenuItem* _tmp86_; + GtkMenuItem* menuChooseFont; + GtkMenuItem* _tmp80_; + GtkMenu* _tmp81_; + GtkMenuItem* _tmp82_; + GtkMenu* _tmp83_; + GtkMenuItem* _tmp84_; + GtkMenu* _tmp85_; + GtkMenuItem* _tmp86_; GtkMenu* _tmp87_; - GtkCheckMenuItem* _tmp88_; - GtkMenu* _tmp89_; - GtkSeparatorMenuItem* _tmp90_; - GtkSeparatorMenuItem* _tmp91_; + GtkSeparatorMenuItem* _tmp88_; + GtkSeparatorMenuItem* _tmp89_; + GtkMenu* _tmp90_; + GtkMenuItem* _tmp91_; GtkMenu* _tmp92_; - GtkMenuItem* _tmp93_; + GtkCheckMenuItem* _tmp93_; GtkMenu* _tmp94_; - GtkMenuItem* _tmp95_; - GtkMenuItem* _tmp96_; - GtkMenuItem* _tmp97_; - GtkMenuItem* settingsMenuItem; + GtkSeparatorMenuItem* _tmp95_; + GtkSeparatorMenuItem* _tmp96_; + GtkMenu* _tmp97_; GtkMenuItem* _tmp98_; GtkMenu* _tmp99_; - GtkMenuBar* _tmp100_; + GtkMenuItem* _tmp100_; GtkMenuItem* _tmp101_; - GtkMenu* _tmp102_; - GtkMenu* _tmp103_; - GtkMenuItem* _tmp104_; - GtkMenuItem* _tmp105_; - GtkMenuItem* menuKeyboardShortcuts; + GtkMenuItem* _tmp102_; + GtkMenuItem* settingsMenuItem; + GtkMenuItem* _tmp103_; + GtkMenu* _tmp104_; + GtkMenuBar* _tmp105_; GtkMenuItem* _tmp106_; - GtkMenuItem* _tmp107_; - GtkMenuItem* _tmp108_; - GtkMenuItem* menuAbout; + GtkMenu* _tmp107_; + GtkMenu* _tmp108_; GtkMenuItem* _tmp109_; - GtkMenu* _tmp110_; + GtkMenuItem* _tmp110_; + GtkMenuItem* menuKeyboardShortcuts; GtkMenuItem* _tmp111_; - GtkMenu* _tmp112_; + GtkMenuItem* _tmp112_; GtkMenuItem* _tmp113_; + GtkMenuItem* menuAbout; GtkMenuItem* _tmp114_; - GtkMenuItem* _tmp115_; - GtkMenuItem* helpMenuItem; + GtkMenu* _tmp115_; GtkMenuItem* _tmp116_; GtkMenu* _tmp117_; - GtkMenuBar* _tmp118_; + GtkMenuItem* _tmp118_; GtkMenuItem* _tmp119_; - GtkTextView* _tmp120_; - GtkTextView* _tmp121_; - GtkTextView* _tmp122_; - GtkStyleContext* _tmp123_ = NULL; - GdkRGBA _tmp124_ = {0}; + GtkMenuItem* _tmp120_; + GtkMenuItem* helpMenuItem; + GtkMenuItem* _tmp121_; + GtkMenu* _tmp122_; + GtkMenuBar* _tmp123_; + GtkMenuItem* _tmp124_; GtkTextView* _tmp125_; - GtkStyleContext* _tmp126_ = NULL; - GdkRGBA _tmp127_ = {0}; + GtkTextView* _tmp126_; + GtkTextView* _tmp127_; GtkStyleContext* _tmp128_ = NULL; GdkRGBA _tmp129_ = {0}; + GtkTextView* _tmp130_; + GtkStyleContext* _tmp131_ = NULL; + GdkRGBA _tmp132_ = {0}; + GtkStyleContext* _tmp133_ = NULL; + GdkRGBA _tmp134_ = {0}; gboolean hideMenubar; - gchar* _tmp130_ = NULL; - gchar* _tmp131_; - gchar* _tmp132_ = NULL; - gchar* _tmp133_; - gboolean _tmp134_; - GtkToolbar* _tmp135_; - GtkToolbar* _tmp136_; - GtkToolbar* toolbar; - GtkToolButton* _tmp137_; - GtkToolButton* _tmp138_; - GtkToolbar* _tmp139_; + gchar* _tmp135_ = NULL; + gchar* _tmp136_; + gchar* _tmp137_ = NULL; + gchar* _tmp138_; + gboolean _tmp139_; GtkToolbar* _tmp140_; - GtkStyleContext* _tmp141_ = NULL; - GtkStyleContext* _tmp142_; + GtkToolbar* _tmp141_; + GtkToolbar* toolbar; + GtkToolButton* _tmp142_; + GtkToolButton* _tmp143_; + GtkToolbar* _tmp144_; + GtkToolbar* _tmp145_; + GtkStyleContext* _tmp146_ = NULL; + GtkStyleContext* _tmp147_; GtkStyleContext* context; - GtkStyleContext* _tmp143_; - GtkMenuToolButton* _tmp144_; - GtkMenuToolButton* _tmp145_; - GtkMenuToolButton* _tmp146_; - GtkMenuToolButton* _tmp147_; - GtkToolButton* _tmp148_; - GtkToolButton* _tmp149_; - GtkToolButton* _tmp150_; - GtkToolButton* _tmp151_; - GtkToolButton* _tmp152_; + GtkStyleContext* _tmp148_; + GtkMenuToolButton* _tmp149_; + GtkMenuToolButton* _tmp150_; + GtkMenuToolButton* _tmp151_; + GtkMenuToolButton* _tmp152_; GtkToolButton* _tmp153_; - GtkToolButton* addImageButton; GtkToolButton* _tmp154_; GtkToolButton* _tmp155_; GtkToolButton* _tmp156_; GtkToolButton* _tmp157_; - GtkToolButton* increaseFontSizeButton; GtkToolButton* _tmp158_; + GtkToolButton* addImageButton; GtkToolButton* _tmp159_; GtkToolButton* _tmp160_; GtkToolButton* _tmp161_; - GtkToolButton* decreaseFontSizeButton; GtkToolButton* _tmp162_; + GtkToolButton* increaseFontSizeButton; GtkToolButton* _tmp163_; - GtkMenuToolButton* _tmp164_; - GtkMenuToolButton* _tmp165_; + GtkToolButton* _tmp164_; + GtkToolButton* _tmp165_; + GtkToolButton* _tmp166_; + GtkToolButton* decreaseFontSizeButton; + GtkToolButton* _tmp167_; + GtkToolButton* _tmp168_; + GtkMenuToolButton* _tmp169_; + GtkMenuToolButton* _tmp170_; GtkMenuToolButton* settingsMenuButton; - GtkMenu* _tmp166_; - GtkMenu* _tmp167_; + GtkMenu* _tmp171_; + GtkMenu* _tmp172_; GtkMenu* settingsMenu; - GtkMenuItem* _tmp168_; - GtkMenuItem* _tmp169_; - GtkMenuItem* menuKeyboardShortcutsToolbar; - GtkMenuItem* _tmp170_; - GtkMenuItem* _tmp171_; - GtkMenuItem* _tmp172_; - GtkMenuItem* menuAboutToolbar; GtkMenuItem* _tmp173_; - GtkMenu* _tmp174_; - GtkMenu* _tmp175_; + GtkMenuItem* _tmp174_; + GtkMenuItem* menuKeyboardShortcutsToolbar; + GtkMenuItem* _tmp175_; GtkMenuItem* _tmp176_; GtkMenuItem* _tmp177_; + GtkMenuItem* menuAboutToolbar; GtkMenuItem* _tmp178_; - GtkMenuItem* _tmp179_; - GtkMenuItem* _tmp180_; - GtkMenuItem* menuCreateJournalArchiveTxt; + GtkMenu* _tmp179_; + GtkMenu* _tmp180_; GtkMenuItem* _tmp181_; GtkMenuItem* _tmp182_; GtkMenuItem* _tmp183_; GtkMenuItem* _tmp184_; - GtkCheckMenuItem* _tmp185_; - GtkCheckMenuItem* _tmp186_; - GtkCheckMenuItem* _tmp187_; - gboolean _tmp188_; - gboolean _tmp189_; + GtkMenuItem* _tmp185_; + GtkMenuItem* menuCreateJournalArchiveTxt; + GtkMenuItem* _tmp186_; + GtkMenuItem* _tmp187_; + GtkMenuItem* _tmp188_; + GtkMenuItem* _tmp189_; GtkCheckMenuItem* _tmp190_; - GtkMenuItem* _tmp191_; - GtkMenuItem* _tmp192_; - GtkMenuItem* _tmp193_; - GtkMenuItem* _tmp194_; - GtkMenuItem* _tmp195_; + GtkCheckMenuItem* _tmp191_; + GtkCheckMenuItem* _tmp192_; + gboolean _tmp193_; + gboolean _tmp194_; + GtkCheckMenuItem* _tmp195_; GtkMenuItem* _tmp196_; - GtkMenu* _tmp197_; + GtkMenuItem* _tmp197_; GtkMenuItem* _tmp198_; - GtkMenu* _tmp199_; + GtkMenuItem* _tmp199_; GtkMenuItem* _tmp200_; - GtkMenu* _tmp201_; + GtkMenuItem* _tmp201_; GtkMenuItem* _tmp202_; - GtkMenu* _tmp203_; - GtkSeparatorMenuItem* _tmp204_; - GtkSeparatorMenuItem* _tmp205_; - GtkMenu* _tmp206_; - GtkCheckMenuItem* _tmp207_; - GtkMenu* _tmp208_; - GtkSeparatorMenuItem* _tmp209_; - GtkSeparatorMenuItem* _tmp210_; + GtkMenuItem* _tmp203_; + GtkMenuItem* _tmp204_; + GtkMenu* _tmp205_; + GtkMenuItem* _tmp206_; + GtkMenu* _tmp207_; + GtkMenuItem* _tmp208_; + GtkMenu* _tmp209_; + GtkMenuItem* _tmp210_; GtkMenu* _tmp211_; - GtkMenuItem* _tmp212_; - GtkMenu* _tmp213_; - GtkMenuItem* _tmp214_; - GtkMenu* _tmp215_; - GtkSeparatorMenuItem* _tmp216_; - GtkSeparatorMenuItem* _tmp217_; + GtkSeparatorMenuItem* _tmp212_; + GtkSeparatorMenuItem* _tmp213_; + GtkMenu* _tmp214_; + GtkMenuItem* _tmp215_; + GtkMenu* _tmp216_; + GtkCheckMenuItem* _tmp217_; GtkMenu* _tmp218_; - GtkMenuItem* _tmp219_; - GtkMenu* _tmp220_; - GtkMenuItem* _tmp221_; - GtkMenuToolButton* _tmp222_; + GtkSeparatorMenuItem* _tmp219_; + GtkSeparatorMenuItem* _tmp220_; + GtkMenu* _tmp221_; + GtkMenuItem* _tmp222_; GtkMenu* _tmp223_; - GtkMenu* _tmp224_; - GtkMenuToolButton* _tmp225_; - GtkToolbar* _tmp226_; - GtkMenuToolButton* _tmp227_; - GtkToolbar* _tmp228_; - GtkSeparatorToolItem* _tmp229_; - GtkSeparatorToolItem* _tmp230_; - GtkToolbar* _tmp231_; - GtkToolButton* _tmp232_; - GtkToolbar* _tmp233_; - GtkSeparatorToolItem* _tmp234_; - GtkSeparatorToolItem* _tmp235_; + GtkMenuItem* _tmp224_; + GtkMenu* _tmp225_; + GtkSeparatorMenuItem* _tmp226_; + GtkSeparatorMenuItem* _tmp227_; + GtkMenu* _tmp228_; + GtkMenuItem* _tmp229_; + GtkMenu* _tmp230_; + GtkMenuItem* _tmp231_; + GtkMenuToolButton* _tmp232_; + GtkMenu* _tmp233_; + GtkMenu* _tmp234_; + GtkMenuToolButton* _tmp235_; GtkToolbar* _tmp236_; - GtkToolButton* _tmp237_; + GtkMenuToolButton* _tmp237_; GtkToolbar* _tmp238_; GtkSeparatorToolItem* _tmp239_; GtkSeparatorToolItem* _tmp240_; GtkToolbar* _tmp241_; GtkToolButton* _tmp242_; GtkToolbar* _tmp243_; - GtkToolButton* _tmp244_; + GtkSeparatorToolItem* _tmp244_; GtkSeparatorToolItem* _tmp245_; - GtkSeparatorToolItem* _tmp246_; - GtkSeparatorToolItem* separator; - GtkToolbar* _tmp247_; - GtkSeparatorToolItem* _tmp248_; - GtkToolbar* _tmp249_; + GtkToolbar* _tmp246_; + GtkToolButton* _tmp247_; + GtkToolbar* _tmp248_; + GtkSeparatorToolItem* _tmp249_; GtkSeparatorToolItem* _tmp250_; - GValue _tmp251_ = {0}; - GtkSeparatorToolItem* _tmp252_; + GtkToolbar* _tmp251_; + GtkToolButton* _tmp252_; GtkToolbar* _tmp253_; - GtkSeparatorToolItem* _tmp254_; - GtkToolbar* _tmp255_; - GtkMenuToolButton* _tmp256_; - GtkTextView* _tmp257_; - GtkTextBuffer* _tmp258_; - GtkTextBuffer* _tmp259_; - GtkTextView* _tmp260_; - GtkTextBuffer* _tmp261_; - GtkTextBuffer* _tmp262_; - JournalEditor* _tmp263_; - GtkTextView* _tmp264_; - GtkTextView* _tmp265_; - GtkTextView* _tmp266_; + GtkToolButton* _tmp254_; + GtkSeparatorToolItem* _tmp255_; + GtkSeparatorToolItem* _tmp256_; + GtkSeparatorToolItem* separator; + GtkToolbar* _tmp257_; + GtkSeparatorToolItem* _tmp258_; + GtkToolbar* _tmp259_; + GtkSeparatorToolItem* _tmp260_; + GValue _tmp261_ = {0}; + GtkSeparatorToolItem* _tmp262_; + GtkToolbar* _tmp263_; + GtkSeparatorToolItem* _tmp264_; + GtkToolbar* _tmp265_; + GtkMenuToolButton* _tmp266_; GtkTextView* _tmp267_; - GtkTextView* _tmp268_; - GtkTextView* _tmp269_; + GtkTextBuffer* _tmp268_; + GtkTextBuffer* _tmp269_; GtkTextView* _tmp270_; - GtkScrolledWindow* _tmp271_; - GtkScrolledWindow* _tmp272_; - GtkScrolledWindow* _tmp273_; - GtkScrolledWindow* _tmp274_; - GtkScrolledWindow* _tmp275_; - GtkScrolledWindow* _tmp276_; - GtkScrolledWindow* _tmp277_; + GtkTextBuffer* _tmp271_; + GtkTextBuffer* _tmp272_; + JournalEditor* _tmp273_; + GtkTextView* _tmp274_; + GtkTextView* _tmp275_; + GtkTextView* _tmp276_; + GtkTextView* _tmp277_; GtkTextView* _tmp278_; - GtkScrolledWindow* _tmp279_; - GtkBox* _tmp280_; - GtkBox* _tmp281_; - GtkBox* entryBox; - GtkBox* _tmp282_; + GtkTextView* _tmp279_; + GtkTextView* _tmp280_; + GtkScrolledWindow* _tmp281_; + GtkScrolledWindow* _tmp282_; GtkScrolledWindow* _tmp283_; - GtkButton* _tmp284_; - GtkButton* _tmp285_; - GtkButton* _tmp286_; - GtkCalendar* _tmp287_; - GtkCalendar* _tmp288_; - GtkCalendar* _tmp289_; - GtkCalendar* _tmp290_; + GtkScrolledWindow* _tmp284_; + GtkScrolledWindow* _tmp285_; + GtkScrolledWindow* _tmp286_; + GtkScrolledWindow* _tmp287_; + GtkTextView* _tmp288_; + GtkScrolledWindow* _tmp289_; + GtkBox* _tmp290_; GtkBox* _tmp291_; + GtkBox* entryBox; GtkBox* _tmp292_; - GtkBox* hbox; - GtkBox* _tmp293_; - GtkBox* _tmp294_; - GtkBox* _tmp295_; - GtkBox* _tmp296_; - GtkBox* calendarBox; - GtkBox* _tmp297_; - GtkButton* _tmp298_; - GtkBox* _tmp299_; + GtkScrolledWindow* _tmp293_; + GtkButton* _tmp294_; + GtkButton* _tmp295_; + GtkButton* _tmp296_; + GtkCalendar* _tmp297_; + GtkCalendar* _tmp298_; + GtkCalendar* _tmp299_; GtkCalendar* _tmp300_; GtkBox* _tmp301_; GtkBox* _tmp302_; + GtkBox* hbox; GtkBox* _tmp303_; GtkBox* _tmp304_; - GtkBox* vbox; - gboolean _tmp305_; - GtkBox* _tmp308_; - GtkToolbar* _tmp309_; - GtkBox* _tmp310_; + GtkBox* _tmp305_; + GtkBox* _tmp306_; + GtkBox* calendarBox; + GtkBox* _tmp307_; + GtkButton* _tmp308_; + GtkBox* _tmp309_; + GtkCalendar* _tmp310_; GtkBox* _tmp311_; GtkBox* _tmp312_; - gint _tmp313_; - gint _tmp314_; + GtkBox* _tmp313_; + GtkBox* _tmp314_; + GtkBox* vbox; + gboolean _tmp315_; + GtkBox* _tmp318_; + GtkToolbar* _tmp319_; + GtkBox* _tmp320_; + GtkBox* _tmp321_; + GtkBox* _tmp322_; + const gchar* _tmp323_; + const gchar* _tmp324_; + PangoFontDescription* _tmp325_ = NULL; + PangoFontDescription* font; + GtkTextView* _tmp326_; _data1_ = g_slice_new0 (Block1Data); _data1_->_ref_count_ = 1; self = (Main*) g_object_new (object_type, NULL); @@ -1368,277 +1407,278 @@ menuDecreaseCalendarFontSize = _tmp76_; _tmp77_ = menuDecreaseCalendarFontSize; g_signal_connect_object (_tmp77_, "activate", (GCallback) ___lambda20__gtk_menu_item_activate, self, 0); - _tmp78_ = self->priv->settingsMenu; - _tmp79_ = menuUnlockEntry; - gtk_menu_shell_append ((GtkMenuShell*) _tmp78_, (GtkWidget*) _tmp79_); - _tmp80_ = self->priv->settingsMenu; - _tmp81_ = menuIncreaseFontSize; - gtk_menu_shell_append ((GtkMenuShell*) _tmp80_, (GtkWidget*) _tmp81_); - _tmp82_ = self->priv->settingsMenu; - _tmp83_ = menuDecreaseFontSize; - gtk_menu_shell_append ((GtkMenuShell*) _tmp82_, (GtkWidget*) _tmp83_); - _tmp84_ = self->priv->settingsMenu; - _tmp85_ = (GtkSeparatorMenuItem*) gtk_separator_menu_item_new (); - _tmp86_ = g_object_ref_sink (_tmp85_); - gtk_menu_shell_append ((GtkMenuShell*) _tmp84_, (GtkWidget*) ((GtkMenuItem*) _tmp86_)); - _g_object_unref0 (_tmp86_); + _tmp78_ = (GtkMenuItem*) gtk_menu_item_new_with_label ("Change Entry Font..."); + _tmp79_ = g_object_ref_sink (_tmp78_); + menuChooseFont = _tmp79_; + _tmp80_ = menuChooseFont; + g_signal_connect_object (_tmp80_, "activate", (GCallback) ___lambda21__gtk_menu_item_activate, self, 0); + _tmp81_ = self->priv->settingsMenu; + _tmp82_ = menuUnlockEntry; + gtk_menu_shell_append ((GtkMenuShell*) _tmp81_, (GtkWidget*) _tmp82_); + _tmp83_ = self->priv->settingsMenu; + _tmp84_ = menuIncreaseFontSize; + gtk_menu_shell_append ((GtkMenuShell*) _tmp83_, (GtkWidget*) _tmp84_); + _tmp85_ = self->priv->settingsMenu; + _tmp86_ = menuDecreaseFontSize; + gtk_menu_shell_append ((GtkMenuShell*) _tmp85_, (GtkWidget*) _tmp86_); _tmp87_ = self->priv->settingsMenu; - _tmp88_ = _data1_->menuLockPastEntries; - gtk_menu_shell_append ((GtkMenuShell*) _tmp87_, (GtkWidget*) ((GtkMenuItem*) _tmp88_)); - _tmp89_ = self->priv->settingsMenu; - _tmp90_ = (GtkSeparatorMenuItem*) gtk_separator_menu_item_new (); - _tmp91_ = g_object_ref_sink (_tmp90_); - gtk_menu_shell_append ((GtkMenuShell*) _tmp89_, (GtkWidget*) ((GtkMenuItem*) _tmp91_)); - _g_object_unref0 (_tmp91_); + _tmp88_ = (GtkSeparatorMenuItem*) gtk_separator_menu_item_new (); + _tmp89_ = g_object_ref_sink (_tmp88_); + gtk_menu_shell_append ((GtkMenuShell*) _tmp87_, (GtkWidget*) ((GtkMenuItem*) _tmp89_)); + _g_object_unref0 (_tmp89_); + _tmp90_ = self->priv->settingsMenu; + _tmp91_ = menuChooseFont; + gtk_menu_shell_append ((GtkMenuShell*) _tmp90_, (GtkWidget*) _tmp91_); _tmp92_ = self->priv->settingsMenu; - _tmp93_ = menuIncreaseCalendarFontSize; - gtk_menu_shell_append ((GtkMenuShell*) _tmp92_, (GtkWidget*) _tmp93_); + _tmp93_ = _data1_->menuLockPastEntries; + gtk_menu_shell_append ((GtkMenuShell*) _tmp92_, (GtkWidget*) ((GtkMenuItem*) _tmp93_)); _tmp94_ = self->priv->settingsMenu; - _tmp95_ = menuDecreaseCalendarFontSize; - gtk_menu_shell_append ((GtkMenuShell*) _tmp94_, (GtkWidget*) _tmp95_); - _tmp96_ = (GtkMenuItem*) gtk_menu_item_new_with_label ("Settings"); - _tmp97_ = g_object_ref_sink (_tmp96_); - settingsMenuItem = _tmp97_; - _tmp98_ = settingsMenuItem; + _tmp95_ = (GtkSeparatorMenuItem*) gtk_separator_menu_item_new (); + _tmp96_ = g_object_ref_sink (_tmp95_); + gtk_menu_shell_append ((GtkMenuShell*) _tmp94_, (GtkWidget*) ((GtkMenuItem*) _tmp96_)); + _g_object_unref0 (_tmp96_); + _tmp97_ = self->priv->settingsMenu; + _tmp98_ = menuIncreaseCalendarFontSize; + gtk_menu_shell_append ((GtkMenuShell*) _tmp97_, (GtkWidget*) _tmp98_); _tmp99_ = self->priv->settingsMenu; - gtk_menu_item_set_submenu (_tmp98_, (GtkWidget*) _tmp99_); - _tmp100_ = self->priv->menubar; - _tmp101_ = settingsMenuItem; - gtk_menu_shell_append ((GtkMenuShell*) _tmp100_, (GtkWidget*) _tmp101_); - _tmp102_ = (GtkMenu*) gtk_menu_new (); - _tmp103_ = g_object_ref_sink (_tmp102_); - _g_object_unref0 (self->priv->helpMenu); - self->priv->helpMenu = _tmp103_; - _tmp104_ = (GtkMenuItem*) gtk_menu_item_new_with_label ("Keyboard Shortcuts"); - _tmp105_ = g_object_ref_sink (_tmp104_); - menuKeyboardShortcuts = _tmp105_; - _tmp106_ = menuKeyboardShortcuts; - g_signal_connect_object (_tmp106_, "activate", (GCallback) ___lambda21__gtk_menu_item_activate, self, 0); - _tmp107_ = (GtkMenuItem*) gtk_menu_item_new_with_label ("About DayJournal"); + _tmp100_ = menuDecreaseCalendarFontSize; + gtk_menu_shell_append ((GtkMenuShell*) _tmp99_, (GtkWidget*) _tmp100_); + _tmp101_ = (GtkMenuItem*) gtk_menu_item_new_with_label ("Settings"); + _tmp102_ = g_object_ref_sink (_tmp101_); + settingsMenuItem = _tmp102_; + _tmp103_ = settingsMenuItem; + _tmp104_ = self->priv->settingsMenu; + gtk_menu_item_set_submenu (_tmp103_, (GtkWidget*) _tmp104_); + _tmp105_ = self->priv->menubar; + _tmp106_ = settingsMenuItem; + gtk_menu_shell_append ((GtkMenuShell*) _tmp105_, (GtkWidget*) _tmp106_); + _tmp107_ = (GtkMenu*) gtk_menu_new (); _tmp108_ = g_object_ref_sink (_tmp107_); - menuAbout = _tmp108_; - _tmp109_ = menuAbout; - g_signal_connect_object (_tmp109_, "activate", (GCallback) ___lambda22__gtk_menu_item_activate, self, 0); - _tmp110_ = self->priv->helpMenu; + _g_object_unref0 (self->priv->helpMenu); + self->priv->helpMenu = _tmp108_; + _tmp109_ = (GtkMenuItem*) gtk_menu_item_new_with_label ("Keyboard Shortcuts"); + _tmp110_ = g_object_ref_sink (_tmp109_); + menuKeyboardShortcuts = _tmp110_; _tmp111_ = menuKeyboardShortcuts; - gtk_menu_shell_append ((GtkMenuShell*) _tmp110_, (GtkWidget*) _tmp111_); - _tmp112_ = self->priv->helpMenu; - _tmp113_ = menuAbout; - gtk_menu_shell_append ((GtkMenuShell*) _tmp112_, (GtkWidget*) _tmp113_); - _tmp114_ = (GtkMenuItem*) gtk_menu_item_new_with_label ("Help"); - _tmp115_ = g_object_ref_sink (_tmp114_); - helpMenuItem = _tmp115_; - _tmp116_ = helpMenuItem; + g_signal_connect_object (_tmp111_, "activate", (GCallback) ___lambda22__gtk_menu_item_activate, self, 0); + _tmp112_ = (GtkMenuItem*) gtk_menu_item_new_with_label ("About DayJournal"); + _tmp113_ = g_object_ref_sink (_tmp112_); + menuAbout = _tmp113_; + _tmp114_ = menuAbout; + g_signal_connect_object (_tmp114_, "activate", (GCallback) ___lambda23__gtk_menu_item_activate, self, 0); + _tmp115_ = self->priv->helpMenu; + _tmp116_ = menuKeyboardShortcuts; + gtk_menu_shell_append ((GtkMenuShell*) _tmp115_, (GtkWidget*) _tmp116_); _tmp117_ = self->priv->helpMenu; - gtk_menu_item_set_submenu (_tmp116_, (GtkWidget*) _tmp117_); - _tmp118_ = self->priv->menubar; - _tmp119_ = helpMenuItem; - gtk_menu_shell_append ((GtkMenuShell*) _tmp118_, (GtkWidget*) _tmp119_); - _tmp120_ = (GtkTextView*) gtk_text_view_new (); - _tmp121_ = g_object_ref_sink (_tmp120_); + _tmp118_ = menuAbout; + gtk_menu_shell_append ((GtkMenuShell*) _tmp117_, (GtkWidget*) _tmp118_); + _tmp119_ = (GtkMenuItem*) gtk_menu_item_new_with_label ("Help"); + _tmp120_ = g_object_ref_sink (_tmp119_); + helpMenuItem = _tmp120_; + _tmp121_ = helpMenuItem; + _tmp122_ = self->priv->helpMenu; + gtk_menu_item_set_submenu (_tmp121_, (GtkWidget*) _tmp122_); + _tmp123_ = self->priv->menubar; + _tmp124_ = helpMenuItem; + gtk_menu_shell_append ((GtkMenuShell*) _tmp123_, (GtkWidget*) _tmp124_); + _tmp125_ = (GtkTextView*) gtk_text_view_new (); + _tmp126_ = g_object_ref_sink (_tmp125_); _g_object_unref0 (self->priv->entryTextView); - self->priv->entryTextView = _tmp121_; - _tmp122_ = self->priv->entryTextView; - _tmp123_ = gtk_widget_get_style_context ((GtkWidget*) _tmp122_); - gtk_style_context_get_background_color (_tmp123_, GTK_STATE_FLAG_SELECTED, &_tmp124_); - self->priv->selectionColor = _tmp124_; - _tmp125_ = self->priv->entryTextView; - _tmp126_ = gtk_widget_get_style_context ((GtkWidget*) _tmp125_); - gtk_style_context_get_background_color (_tmp126_, GTK_STATE_FLAG_NORMAL, &_tmp127_); - self->priv->unlockedBgColor = _tmp127_; - _tmp128_ = gtk_widget_get_style_context ((GtkWidget*) self); - gtk_style_context_get_background_color (_tmp128_, GTK_STATE_FLAG_NORMAL, &_tmp129_); - self->priv->lockedBgColor = _tmp129_; + self->priv->entryTextView = _tmp126_; + _tmp127_ = self->priv->entryTextView; + _tmp128_ = gtk_widget_get_style_context ((GtkWidget*) _tmp127_); + gtk_style_context_get_background_color (_tmp128_, GTK_STATE_FLAG_SELECTED, &_tmp129_); + self->priv->selectionColor = _tmp129_; + _tmp130_ = self->priv->entryTextView; + _tmp131_ = gtk_widget_get_style_context ((GtkWidget*) _tmp130_); + gtk_style_context_get_background_color (_tmp131_, GTK_STATE_FLAG_NORMAL, &_tmp132_); + self->priv->unlockedBgColor = _tmp132_; + _tmp133_ = gtk_widget_get_style_context ((GtkWidget*) self); + gtk_style_context_get_background_color (_tmp133_, GTK_STATE_FLAG_NORMAL, &_tmp134_); + self->priv->lockedBgColor = _tmp134_; hideMenubar = FALSE; - _tmp130_ = gdk_rgba_to_string (&self->priv->unlockedBgColor); - _tmp131_ = _tmp130_; - _tmp132_ = gdk_rgba_to_string (&self->priv->lockedBgColor); - _tmp133_ = _tmp132_; - _tmp134_ = g_strcmp0 (_tmp131_, _tmp133_) == 0; - _g_free0 (_tmp133_); - _g_free0 (_tmp131_); - if (_tmp134_) { + _tmp135_ = gdk_rgba_to_string (&self->priv->unlockedBgColor); + _tmp136_ = _tmp135_; + _tmp137_ = gdk_rgba_to_string (&self->priv->lockedBgColor); + _tmp138_ = _tmp137_; + _tmp139_ = g_strcmp0 (_tmp136_, _tmp138_) == 0; + _g_free0 (_tmp138_); + _g_free0 (_tmp136_); + if (_tmp139_) { memset (&self->priv->unlockedBgColor, 0, sizeof (GdkRGBA)); gdk_rgba_parse (&self->priv->unlockedBgColor, "#FFFFFF"); hideMenubar = TRUE; } else { } - _tmp135_ = (GtkToolbar*) gtk_toolbar_new (); - _tmp136_ = g_object_ref_sink (_tmp135_); - toolbar = _tmp136_; - _tmp137_ = (GtkToolButton*) gtk_tool_button_new (NULL, NULL); - _tmp138_ = g_object_ref_sink (_tmp137_); + _tmp140_ = (GtkToolbar*) gtk_toolbar_new (); + _tmp141_ = g_object_ref_sink (_tmp140_); + toolbar = _tmp141_; + _tmp142_ = (GtkToolButton*) gtk_tool_button_new (NULL, NULL); + _tmp143_ = g_object_ref_sink (_tmp142_); _g_object_unref0 (self->priv->unlockButton); - self->priv->unlockButton = _tmp138_; - _tmp139_ = toolbar; - gtk_toolbar_set_style (_tmp139_, GTK_TOOLBAR_ICONS); - _tmp140_ = toolbar; - _tmp141_ = gtk_widget_get_style_context ((GtkWidget*) _tmp140_); - _tmp142_ = _g_object_ref0 (_tmp141_); - context = _tmp142_; - _tmp143_ = context; - gtk_style_context_add_class (_tmp143_, GTK_STYLE_CLASS_PRIMARY_TOOLBAR); - _tmp144_ = (GtkMenuToolButton*) gtk_menu_tool_button_new_from_stock (GTK_STOCK_OPEN); - _tmp145_ = g_object_ref_sink (_tmp144_); + self->priv->unlockButton = _tmp143_; + _tmp144_ = toolbar; + gtk_toolbar_set_style (_tmp144_, GTK_TOOLBAR_ICONS); + _tmp145_ = toolbar; + _tmp146_ = gtk_widget_get_style_context ((GtkWidget*) _tmp145_); + _tmp147_ = _g_object_ref0 (_tmp146_); + context = _tmp147_; + _tmp148_ = context; + gtk_style_context_add_class (_tmp148_, GTK_STYLE_CLASS_PRIMARY_TOOLBAR); + _tmp149_ = (GtkMenuToolButton*) gtk_menu_tool_button_new_from_stock (GTK_STOCK_OPEN); + _tmp150_ = g_object_ref_sink (_tmp149_); _g_object_unref0 (self->priv->openButton); - self->priv->openButton = _tmp145_; - _tmp146_ = self->priv->openButton; - gtk_widget_set_tooltip_text ((GtkWidget*) _tmp146_, "Change journal folder"); - _tmp147_ = self->priv->openButton; - g_signal_connect_object ((GtkToolButton*) _tmp147_, "clicked", (GCallback) ___lambda23__gtk_tool_button_clicked, self, 0); + self->priv->openButton = _tmp150_; + _tmp151_ = self->priv->openButton; + gtk_widget_set_tooltip_text ((GtkWidget*) _tmp151_, "Change journal folder"); + _tmp152_ = self->priv->openButton; + g_signal_connect_object ((GtkToolButton*) _tmp152_, "clicked", (GCallback) ___lambda24__gtk_tool_button_clicked, self, 0); main_setOpenJournalsMenuItems (self); - _tmp148_ = (GtkToolButton*) gtk_tool_button_new_from_stock (GTK_STOCK_EDIT); - _tmp149_ = g_object_ref_sink (_tmp148_); + _tmp153_ = (GtkToolButton*) gtk_tool_button_new_from_stock (GTK_STOCK_EDIT); + _tmp154_ = g_object_ref_sink (_tmp153_); _g_object_unref0 (self->priv->unlockButton); - self->priv->unlockButton = _tmp149_; - _tmp150_ = self->priv->unlockButton; - gtk_widget_set_tooltip_text ((GtkWidget*) _tmp150_, "Unlock entry"); - _tmp151_ = self->priv->unlockButton; - g_signal_connect_object (_tmp151_, "clicked", (GCallback) ___lambda24__gtk_tool_button_clicked, self, 0); - _tmp152_ = (GtkToolButton*) gtk_tool_button_new_from_stock (GTK_STOCK_ADD); - _tmp153_ = g_object_ref_sink (_tmp152_); - addImageButton = _tmp153_; - _tmp154_ = addImageButton; - gtk_widget_set_tooltip_text ((GtkWidget*) _tmp154_, "Add image to entry"); - _tmp155_ = addImageButton; - g_signal_connect_object (_tmp155_, "clicked", (GCallback) ___lambda25__gtk_tool_button_clicked, self, 0); - _tmp156_ = (GtkToolButton*) gtk_tool_button_new_from_stock (GTK_STOCK_ZOOM_IN); - _tmp157_ = g_object_ref_sink (_tmp156_); - increaseFontSizeButton = _tmp157_; - _tmp158_ = increaseFontSizeButton; - gtk_widget_set_tooltip_text ((GtkWidget*) _tmp158_, "Increase font size"); - _tmp159_ = increaseFontSizeButton; - g_signal_connect_object (_tmp159_, "clicked", (GCallback) ___lambda26__gtk_tool_button_clicked, self, 0); - _tmp160_ = (GtkToolButton*) gtk_tool_button_new_from_stock (GTK_STOCK_ZOOM_OUT); - _tmp161_ = g_object_ref_sink (_tmp160_); - decreaseFontSizeButton = _tmp161_; - _tmp162_ = decreaseFontSizeButton; - gtk_widget_set_tooltip_text ((GtkWidget*) _tmp162_, "Decrease font size"); - _tmp163_ = decreaseFontSizeButton; - g_signal_connect_object (_tmp163_, "clicked", (GCallback) ___lambda27__gtk_tool_button_clicked, self, 0); - _tmp164_ = (GtkMenuToolButton*) gtk_menu_tool_button_new_from_stock (GTK_STOCK_INFO); - _tmp165_ = g_object_ref_sink (_tmp164_); - settingsMenuButton = _tmp165_; - _tmp166_ = (GtkMenu*) gtk_menu_new (); - _tmp167_ = g_object_ref_sink (_tmp166_); - settingsMenu = _tmp167_; - _tmp168_ = (GtkMenuItem*) gtk_menu_item_new_with_label ("Keyboard Shortcuts"); - _tmp169_ = g_object_ref_sink (_tmp168_); - menuKeyboardShortcutsToolbar = _tmp169_; - _tmp170_ = menuKeyboardShortcutsToolbar; - g_signal_connect_object (_tmp170_, "activate", (GCallback) ___lambda28__gtk_menu_item_activate, self, 0); - _tmp171_ = (GtkMenuItem*) gtk_menu_item_new_with_label ("About DayJournal"); + self->priv->unlockButton = _tmp154_; + _tmp155_ = self->priv->unlockButton; + gtk_widget_set_tooltip_text ((GtkWidget*) _tmp155_, "Unlock entry"); + _tmp156_ = self->priv->unlockButton; + g_signal_connect_object (_tmp156_, "clicked", (GCallback) ___lambda25__gtk_tool_button_clicked, self, 0); + _tmp157_ = (GtkToolButton*) gtk_tool_button_new_from_stock (GTK_STOCK_ADD); + _tmp158_ = g_object_ref_sink (_tmp157_); + addImageButton = _tmp158_; + _tmp159_ = addImageButton; + gtk_widget_set_tooltip_text ((GtkWidget*) _tmp159_, "Add image to entry"); + _tmp160_ = addImageButton; + g_signal_connect_object (_tmp160_, "clicked", (GCallback) ___lambda26__gtk_tool_button_clicked, self, 0); + _tmp161_ = (GtkToolButton*) gtk_tool_button_new_from_stock (GTK_STOCK_ZOOM_IN); + _tmp162_ = g_object_ref_sink (_tmp161_); + increaseFontSizeButton = _tmp162_; + _tmp163_ = increaseFontSizeButton; + gtk_widget_set_tooltip_text ((GtkWidget*) _tmp163_, "Increase font size"); + _tmp164_ = increaseFontSizeButton; + g_signal_connect_object (_tmp164_, "clicked", (GCallback) ___lambda27__gtk_tool_button_clicked, self, 0); + _tmp165_ = (GtkToolButton*) gtk_tool_button_new_from_stock (GTK_STOCK_ZOOM_OUT); + _tmp166_ = g_object_ref_sink (_tmp165_); + decreaseFontSizeButton = _tmp166_; + _tmp167_ = decreaseFontSizeButton; + gtk_widget_set_tooltip_text ((GtkWidget*) _tmp167_, "Decrease font size"); + _tmp168_ = decreaseFontSizeButton; + g_signal_connect_object (_tmp168_, "clicked", (GCallback) ___lambda28__gtk_tool_button_clicked, self, 0); + _tmp169_ = (GtkMenuToolButton*) gtk_menu_tool_button_new_from_stock (GTK_STOCK_INFO); + _tmp170_ = g_object_ref_sink (_tmp169_); + settingsMenuButton = _tmp170_; + _tmp171_ = (GtkMenu*) gtk_menu_new (); _tmp172_ = g_object_ref_sink (_tmp171_); - menuAboutToolbar = _tmp172_; - _tmp173_ = menuAboutToolbar; - g_signal_connect_object (_tmp173_, "activate", (GCallback) ___lambda29__gtk_menu_item_activate, self, 0); - _tmp174_ = (GtkMenu*) gtk_menu_new (); - _tmp175_ = g_object_ref_sink (_tmp174_); - _g_object_unref0 (settingsMenu); - settingsMenu = _tmp175_; - _tmp176_ = (GtkMenuItem*) gtk_menu_item_new_with_label ("Create Complete Journal Archive"); + settingsMenu = _tmp172_; + _tmp173_ = (GtkMenuItem*) gtk_menu_item_new_with_label ("Keyboard Shortcuts"); + _tmp174_ = g_object_ref_sink (_tmp173_); + menuKeyboardShortcutsToolbar = _tmp174_; + _tmp175_ = menuKeyboardShortcutsToolbar; + g_signal_connect_object (_tmp175_, "activate", (GCallback) ___lambda29__gtk_menu_item_activate, self, 0); + _tmp176_ = (GtkMenuItem*) gtk_menu_item_new_with_label ("About DayJournal"); _tmp177_ = g_object_ref_sink (_tmp176_); - _g_object_unref0 (self->priv->menuCreateJournalArchive); - self->priv->menuCreateJournalArchive = _tmp177_; - _tmp178_ = self->priv->menuCreateJournalArchive; + menuAboutToolbar = _tmp177_; + _tmp178_ = menuAboutToolbar; g_signal_connect_object (_tmp178_, "activate", (GCallback) ___lambda30__gtk_menu_item_activate, self, 0); - _tmp179_ = (GtkMenuItem*) gtk_menu_item_new_with_label ("Create Plain Text Journal Archive"); + _tmp179_ = (GtkMenu*) gtk_menu_new (); _tmp180_ = g_object_ref_sink (_tmp179_); - menuCreateJournalArchiveTxt = _tmp180_; - _tmp181_ = menuCreateJournalArchiveTxt; - g_signal_connect_object (_tmp181_, "activate", (GCallback) ___lambda31__gtk_menu_item_activate, self, 0); - _tmp182_ = (GtkMenuItem*) gtk_menu_item_new_with_label ("View Current Journal Files"); - _tmp183_ = g_object_ref_sink (_tmp182_); + _g_object_unref0 (settingsMenu); + settingsMenu = _tmp180_; + _tmp181_ = (GtkMenuItem*) gtk_menu_item_new_with_label ("Create Complete Journal Archive"); + _tmp182_ = g_object_ref_sink (_tmp181_); + _g_object_unref0 (self->priv->menuCreateJournalArchive); + self->priv->menuCreateJournalArchive = _tmp182_; + _tmp183_ = self->priv->menuCreateJournalArchive; + g_signal_connect_object (_tmp183_, "activate", (GCallback) ___lambda31__gtk_menu_item_activate, self, 0); + _tmp184_ = (GtkMenuItem*) gtk_menu_item_new_with_label ("Create Plain Text Journal Archive"); + _tmp185_ = g_object_ref_sink (_tmp184_); + menuCreateJournalArchiveTxt = _tmp185_; + _tmp186_ = menuCreateJournalArchiveTxt; + g_signal_connect_object (_tmp186_, "activate", (GCallback) ___lambda32__gtk_menu_item_activate, self, 0); + _tmp187_ = (GtkMenuItem*) gtk_menu_item_new_with_label ("View Current Journal Files"); + _tmp188_ = g_object_ref_sink (_tmp187_); _g_object_unref0 (self->priv->menuOpenDjLocation); - self->priv->menuOpenDjLocation = _tmp183_; - _tmp184_ = self->priv->menuOpenDjLocation; - g_signal_connect_object (_tmp184_, "activate", (GCallback) ___lambda32__gtk_menu_item_activate, self, 0); - _tmp185_ = (GtkCheckMenuItem*) gtk_check_menu_item_new_with_label ("Lock past entries by default"); - _tmp186_ = g_object_ref_sink (_tmp185_); + self->priv->menuOpenDjLocation = _tmp188_; + _tmp189_ = self->priv->menuOpenDjLocation; + g_signal_connect_object (_tmp189_, "activate", (GCallback) ___lambda33__gtk_menu_item_activate, self, 0); + _tmp190_ = (GtkCheckMenuItem*) gtk_check_menu_item_new_with_label ("Lock past entries by default"); + _tmp191_ = g_object_ref_sink (_tmp190_); _g_object_unref0 (_data1_->menuLockPastEntries); - _data1_->menuLockPastEntries = _tmp186_; - _tmp187_ = _data1_->menuLockPastEntries; - _tmp188_ = user_data_get_lockPastEntries (); - _tmp189_ = _tmp188_; - gtk_check_menu_item_set_active (_tmp187_, _tmp189_); - _tmp190_ = _data1_->menuLockPastEntries; - g_signal_connect_data (_tmp190_, "toggled", (GCallback) ___lambda33__gtk_check_menu_item_toggled, block1_data_ref (_data1_), (GClosureNotify) block1_data_unref, 0); - _tmp191_ = (GtkMenuItem*) gtk_menu_item_new_with_label ("Increase calendar size"); - _tmp192_ = g_object_ref_sink (_tmp191_); + _data1_->menuLockPastEntries = _tmp191_; + _tmp192_ = _data1_->menuLockPastEntries; + _tmp193_ = user_data_get_lockPastEntries (); + _tmp194_ = _tmp193_; + gtk_check_menu_item_set_active (_tmp192_, _tmp194_); + _tmp195_ = _data1_->menuLockPastEntries; + g_signal_connect_data (_tmp195_, "toggled", (GCallback) ___lambda34__gtk_check_menu_item_toggled, block1_data_ref (_data1_), (GClosureNotify) block1_data_unref, 0); + _tmp196_ = (GtkMenuItem*) gtk_menu_item_new_with_label ("Increase calendar size"); + _tmp197_ = g_object_ref_sink (_tmp196_); _g_object_unref0 (menuIncreaseCalendarFontSize); - menuIncreaseCalendarFontSize = _tmp192_; - _tmp193_ = menuIncreaseCalendarFontSize; - g_signal_connect_object (_tmp193_, "activate", (GCallback) ___lambda34__gtk_menu_item_activate, self, 0); - _tmp194_ = (GtkMenuItem*) gtk_menu_item_new_with_label ("Decrease calendar size"); - _tmp195_ = g_object_ref_sink (_tmp194_); + menuIncreaseCalendarFontSize = _tmp197_; + _tmp198_ = menuIncreaseCalendarFontSize; + g_signal_connect_object (_tmp198_, "activate", (GCallback) ___lambda35__gtk_menu_item_activate, self, 0); + _tmp199_ = (GtkMenuItem*) gtk_menu_item_new_with_label ("Decrease calendar size"); + _tmp200_ = g_object_ref_sink (_tmp199_); _g_object_unref0 (menuDecreaseCalendarFontSize); - menuDecreaseCalendarFontSize = _tmp195_; - _tmp196_ = menuDecreaseCalendarFontSize; - g_signal_connect_object (_tmp196_, "activate", (GCallback) ___lambda35__gtk_menu_item_activate, self, 0); - _tmp197_ = settingsMenu; - _tmp198_ = self->priv->menuCreateJournalArchive; - gtk_menu_shell_append ((GtkMenuShell*) _tmp197_, (GtkWidget*) _tmp198_); - _tmp199_ = settingsMenu; - _tmp200_ = menuCreateJournalArchiveTxt; - gtk_menu_shell_append ((GtkMenuShell*) _tmp199_, (GtkWidget*) _tmp200_); - _tmp201_ = settingsMenu; - _tmp202_ = self->priv->menuOpenDjLocation; - gtk_menu_shell_append ((GtkMenuShell*) _tmp201_, (GtkWidget*) _tmp202_); - _tmp203_ = settingsMenu; - _tmp204_ = (GtkSeparatorMenuItem*) gtk_separator_menu_item_new (); - _tmp205_ = g_object_ref_sink (_tmp204_); - gtk_menu_shell_append ((GtkMenuShell*) _tmp203_, (GtkWidget*) ((GtkMenuItem*) _tmp205_)); - _g_object_unref0 (_tmp205_); - _tmp206_ = settingsMenu; - _tmp207_ = _data1_->menuLockPastEntries; - gtk_menu_shell_append ((GtkMenuShell*) _tmp206_, (GtkWidget*) ((GtkMenuItem*) _tmp207_)); - _tmp208_ = settingsMenu; - _tmp209_ = (GtkSeparatorMenuItem*) gtk_separator_menu_item_new (); - _tmp210_ = g_object_ref_sink (_tmp209_); - gtk_menu_shell_append ((GtkMenuShell*) _tmp208_, (GtkWidget*) ((GtkMenuItem*) _tmp210_)); - _g_object_unref0 (_tmp210_); + menuDecreaseCalendarFontSize = _tmp200_; + _tmp201_ = menuDecreaseCalendarFontSize; + g_signal_connect_object (_tmp201_, "activate", (GCallback) ___lambda36__gtk_menu_item_activate, self, 0); + _tmp202_ = (GtkMenuItem*) gtk_menu_item_new_with_label ("Change Entry Font..."); + _tmp203_ = g_object_ref_sink (_tmp202_); + _g_object_unref0 (menuChooseFont); + menuChooseFont = _tmp203_; + _tmp204_ = menuChooseFont; + g_signal_connect_object (_tmp204_, "activate", (GCallback) ___lambda37__gtk_menu_item_activate, self, 0); + _tmp205_ = settingsMenu; + _tmp206_ = self->priv->menuCreateJournalArchive; + gtk_menu_shell_append ((GtkMenuShell*) _tmp205_, (GtkWidget*) _tmp206_); + _tmp207_ = settingsMenu; + _tmp208_ = menuCreateJournalArchiveTxt; + gtk_menu_shell_append ((GtkMenuShell*) _tmp207_, (GtkWidget*) _tmp208_); + _tmp209_ = settingsMenu; + _tmp210_ = self->priv->menuOpenDjLocation; + gtk_menu_shell_append ((GtkMenuShell*) _tmp209_, (GtkWidget*) _tmp210_); _tmp211_ = settingsMenu; - _tmp212_ = menuIncreaseCalendarFontSize; - gtk_menu_shell_append ((GtkMenuShell*) _tmp211_, (GtkWidget*) _tmp212_); - _tmp213_ = settingsMenu; - _tmp214_ = menuDecreaseCalendarFontSize; - gtk_menu_shell_append ((GtkMenuShell*) _tmp213_, (GtkWidget*) _tmp214_); - _tmp215_ = settingsMenu; - _tmp216_ = (GtkSeparatorMenuItem*) gtk_separator_menu_item_new (); - _tmp217_ = g_object_ref_sink (_tmp216_); - gtk_menu_shell_append ((GtkMenuShell*) _tmp215_, (GtkWidget*) ((GtkMenuItem*) _tmp217_)); - _g_object_unref0 (_tmp217_); + _tmp212_ = (GtkSeparatorMenuItem*) gtk_separator_menu_item_new (); + _tmp213_ = g_object_ref_sink (_tmp212_); + gtk_menu_shell_append ((GtkMenuShell*) _tmp211_, (GtkWidget*) ((GtkMenuItem*) _tmp213_)); + _g_object_unref0 (_tmp213_); + _tmp214_ = settingsMenu; + _tmp215_ = menuChooseFont; + gtk_menu_shell_append ((GtkMenuShell*) _tmp214_, (GtkWidget*) _tmp215_); + _tmp216_ = settingsMenu; + _tmp217_ = _data1_->menuLockPastEntries; + gtk_menu_shell_append ((GtkMenuShell*) _tmp216_, (GtkWidget*) ((GtkMenuItem*) _tmp217_)); _tmp218_ = settingsMenu; - _tmp219_ = menuKeyboardShortcutsToolbar; - gtk_menu_shell_append ((GtkMenuShell*) _tmp218_, (GtkWidget*) _tmp219_); - _tmp220_ = settingsMenu; - _tmp221_ = menuAboutToolbar; - gtk_menu_shell_append ((GtkMenuShell*) _tmp220_, (GtkWidget*) _tmp221_); - _tmp222_ = settingsMenuButton; + _tmp219_ = (GtkSeparatorMenuItem*) gtk_separator_menu_item_new (); + _tmp220_ = g_object_ref_sink (_tmp219_); + gtk_menu_shell_append ((GtkMenuShell*) _tmp218_, (GtkWidget*) ((GtkMenuItem*) _tmp220_)); + _g_object_unref0 (_tmp220_); + _tmp221_ = settingsMenu; + _tmp222_ = menuIncreaseCalendarFontSize; + gtk_menu_shell_append ((GtkMenuShell*) _tmp221_, (GtkWidget*) _tmp222_); _tmp223_ = settingsMenu; - gtk_menu_tool_button_set_menu (_tmp222_, (GtkWidget*) _tmp223_); - _tmp224_ = settingsMenu; - gtk_widget_show_all ((GtkWidget*) _tmp224_); - _tmp225_ = settingsMenuButton; - g_signal_connect_object ((GtkToolButton*) _tmp225_, "clicked", (GCallback) ___lambda36__gtk_tool_button_clicked, self, 0); - _tmp226_ = toolbar; - _tmp227_ = self->priv->openButton; - gtk_toolbar_insert (_tmp226_, (GtkToolItem*) _tmp227_, -1); - _tmp228_ = toolbar; - _tmp229_ = (GtkSeparatorToolItem*) gtk_separator_tool_item_new (); - _tmp230_ = g_object_ref_sink (_tmp229_); - gtk_toolbar_insert (_tmp228_, (GtkToolItem*) _tmp230_, -1); - _g_object_unref0 (_tmp230_); - _tmp231_ = toolbar; - _tmp232_ = self->priv->unlockButton; - gtk_toolbar_insert (_tmp231_, (GtkToolItem*) _tmp232_, -1); - _tmp233_ = toolbar; - _tmp234_ = (GtkSeparatorToolItem*) gtk_separator_tool_item_new (); - _tmp235_ = g_object_ref_sink (_tmp234_); - gtk_toolbar_insert (_tmp233_, (GtkToolItem*) _tmp235_, -1); - _g_object_unref0 (_tmp235_); + _tmp224_ = menuDecreaseCalendarFontSize; + gtk_menu_shell_append ((GtkMenuShell*) _tmp223_, (GtkWidget*) _tmp224_); + _tmp225_ = settingsMenu; + _tmp226_ = (GtkSeparatorMenuItem*) gtk_separator_menu_item_new (); + _tmp227_ = g_object_ref_sink (_tmp226_); + gtk_menu_shell_append ((GtkMenuShell*) _tmp225_, (GtkWidget*) ((GtkMenuItem*) _tmp227_)); + _g_object_unref0 (_tmp227_); + _tmp228_ = settingsMenu; + _tmp229_ = menuKeyboardShortcutsToolbar; + gtk_menu_shell_append ((GtkMenuShell*) _tmp228_, (GtkWidget*) _tmp229_); + _tmp230_ = settingsMenu; + _tmp231_ = menuAboutToolbar; + gtk_menu_shell_append ((GtkMenuShell*) _tmp230_, (GtkWidget*) _tmp231_); + _tmp232_ = settingsMenuButton; + _tmp233_ = settingsMenu; + gtk_menu_tool_button_set_menu (_tmp232_, (GtkWidget*) _tmp233_); + _tmp234_ = settingsMenu; + gtk_widget_show_all ((GtkWidget*) _tmp234_); + _tmp235_ = settingsMenuButton; + g_signal_connect_object ((GtkToolButton*) _tmp235_, "clicked", (GCallback) ___lambda38__gtk_tool_button_clicked, self, 0); _tmp236_ = toolbar; - _tmp237_ = addImageButton; + _tmp237_ = self->priv->openButton; gtk_toolbar_insert (_tmp236_, (GtkToolItem*) _tmp237_, -1); _tmp238_ = toolbar; _tmp239_ = (GtkSeparatorToolItem*) gtk_separator_tool_item_new (); @@ -1646,138 +1686,157 @@ gtk_toolbar_insert (_tmp238_, (GtkToolItem*) _tmp240_, -1); _g_object_unref0 (_tmp240_); _tmp241_ = toolbar; - _tmp242_ = increaseFontSizeButton; + _tmp242_ = self->priv->unlockButton; gtk_toolbar_insert (_tmp241_, (GtkToolItem*) _tmp242_, -1); _tmp243_ = toolbar; - _tmp244_ = decreaseFontSizeButton; - gtk_toolbar_insert (_tmp243_, (GtkToolItem*) _tmp244_, -1); - _tmp245_ = (GtkSeparatorToolItem*) gtk_separator_tool_item_new (); - _tmp246_ = g_object_ref_sink (_tmp245_); - separator = _tmp246_; - _tmp247_ = toolbar; - _tmp248_ = separator; - gtk_container_add ((GtkContainer*) _tmp247_, (GtkWidget*) _tmp248_); - _tmp249_ = toolbar; - _tmp250_ = separator; - g_value_init (&_tmp251_, G_TYPE_BOOLEAN); - g_value_set_boolean (&_tmp251_, TRUE); - gtk_container_child_set_property ((GtkContainer*) _tmp249_, (GtkWidget*) _tmp250_, "expand", &_tmp251_); - G_IS_VALUE (&_tmp251_) ? (g_value_unset (&_tmp251_), NULL) : NULL; - _tmp252_ = separator; - gtk_separator_tool_item_set_draw (_tmp252_, FALSE); + _tmp244_ = (GtkSeparatorToolItem*) gtk_separator_tool_item_new (); + _tmp245_ = g_object_ref_sink (_tmp244_); + gtk_toolbar_insert (_tmp243_, (GtkToolItem*) _tmp245_, -1); + _g_object_unref0 (_tmp245_); + _tmp246_ = toolbar; + _tmp247_ = addImageButton; + gtk_toolbar_insert (_tmp246_, (GtkToolItem*) _tmp247_, -1); + _tmp248_ = toolbar; + _tmp249_ = (GtkSeparatorToolItem*) gtk_separator_tool_item_new (); + _tmp250_ = g_object_ref_sink (_tmp249_); + gtk_toolbar_insert (_tmp248_, (GtkToolItem*) _tmp250_, -1); + _g_object_unref0 (_tmp250_); + _tmp251_ = toolbar; + _tmp252_ = decreaseFontSizeButton; + gtk_toolbar_insert (_tmp251_, (GtkToolItem*) _tmp252_, -1); _tmp253_ = toolbar; - _tmp254_ = separator; + _tmp254_ = increaseFontSizeButton; gtk_toolbar_insert (_tmp253_, (GtkToolItem*) _tmp254_, -1); - _tmp255_ = toolbar; - _tmp256_ = settingsMenuButton; - gtk_toolbar_insert (_tmp255_, (GtkToolItem*) _tmp256_, -1); - _tmp257_ = self->priv->entryTextView; - _tmp258_ = gtk_text_view_get_buffer (_tmp257_); - _tmp259_ = _tmp258_; - g_signal_connect_object (_tmp259_, "changed", (GCallback) ___lambda37__gtk_text_buffer_changed, self, 0); - _tmp260_ = self->priv->entryTextView; - _tmp261_ = gtk_text_view_get_buffer (_tmp260_); - _tmp262_ = _tmp261_; - _tmp263_ = journal_editor_new (_tmp262_); - _g_object_unref0 (self->priv->editor); - self->priv->editor = _tmp263_; - _tmp264_ = self->priv->entryTextView; - gtk_text_view_set_pixels_above_lines (_tmp264_, 2); - _tmp265_ = self->priv->entryTextView; - gtk_text_view_set_pixels_below_lines (_tmp265_, 2); - _tmp266_ = self->priv->entryTextView; - gtk_text_view_set_pixels_inside_wrap (_tmp266_, 4); + _tmp255_ = (GtkSeparatorToolItem*) gtk_separator_tool_item_new (); + _tmp256_ = g_object_ref_sink (_tmp255_); + separator = _tmp256_; + _tmp257_ = toolbar; + _tmp258_ = separator; + gtk_container_add ((GtkContainer*) _tmp257_, (GtkWidget*) _tmp258_); + _tmp259_ = toolbar; + _tmp260_ = separator; + g_value_init (&_tmp261_, G_TYPE_BOOLEAN); + g_value_set_boolean (&_tmp261_, TRUE); + gtk_container_child_set_property ((GtkContainer*) _tmp259_, (GtkWidget*) _tmp260_, "expand", &_tmp261_); + G_IS_VALUE (&_tmp261_) ? (g_value_unset (&_tmp261_), NULL) : NULL; + _tmp262_ = separator; + gtk_separator_tool_item_set_draw (_tmp262_, FALSE); + _tmp263_ = toolbar; + _tmp264_ = separator; + gtk_toolbar_insert (_tmp263_, (GtkToolItem*) _tmp264_, -1); + _tmp265_ = toolbar; + _tmp266_ = settingsMenuButton; + gtk_toolbar_insert (_tmp265_, (GtkToolItem*) _tmp266_, -1); _tmp267_ = self->priv->entryTextView; - gtk_text_view_set_wrap_mode (_tmp267_, GTK_WRAP_WORD_CHAR); - _tmp268_ = self->priv->entryTextView; - gtk_text_view_set_left_margin (_tmp268_, 4); - _tmp269_ = self->priv->entryTextView; - gtk_text_view_set_right_margin (_tmp269_, 4); + _tmp268_ = gtk_text_view_get_buffer (_tmp267_); + _tmp269_ = _tmp268_; + g_signal_connect_object (_tmp269_, "changed", (GCallback) ___lambda39__gtk_text_buffer_changed, self, 0); _tmp270_ = self->priv->entryTextView; - gtk_text_view_set_accepts_tab (_tmp270_, TRUE); - _tmp271_ = (GtkScrolledWindow*) gtk_scrolled_window_new (NULL, NULL); - _tmp272_ = g_object_ref_sink (_tmp271_); - _g_object_unref0 (self->priv->scroll); - self->priv->scroll = _tmp272_; - _tmp273_ = self->priv->scroll; - gtk_scrolled_window_set_shadow_type (_tmp273_, GTK_SHADOW_ETCHED_OUT); - _tmp274_ = self->priv->scroll; - gtk_scrolled_window_set_policy (_tmp274_, GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); - _tmp275_ = self->priv->scroll; - gtk_scrolled_window_set_min_content_width (_tmp275_, 251); - _tmp276_ = self->priv->scroll; - gtk_scrolled_window_set_min_content_height (_tmp276_, 280); - _tmp277_ = self->priv->scroll; + _tmp271_ = gtk_text_view_get_buffer (_tmp270_); + _tmp272_ = _tmp271_; + _tmp273_ = journal_editor_new (_tmp272_); + _g_object_unref0 (self->priv->editor); + self->priv->editor = _tmp273_; + _tmp274_ = self->priv->entryTextView; + gtk_text_view_set_pixels_above_lines (_tmp274_, 2); + _tmp275_ = self->priv->entryTextView; + gtk_text_view_set_pixels_below_lines (_tmp275_, 2); + _tmp276_ = self->priv->entryTextView; + gtk_text_view_set_pixels_inside_wrap (_tmp276_, 4); + _tmp277_ = self->priv->entryTextView; + gtk_text_view_set_wrap_mode (_tmp277_, GTK_WRAP_WORD_CHAR); _tmp278_ = self->priv->entryTextView; - gtk_container_add ((GtkContainer*) _tmp277_, (GtkWidget*) _tmp278_); - _tmp279_ = self->priv->scroll; - g_object_set ((GtkWidget*) _tmp279_, "expand", TRUE, NULL); - _tmp280_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); - _tmp281_ = g_object_ref_sink (_tmp280_); - entryBox = _tmp281_; - _tmp282_ = entryBox; + gtk_text_view_set_left_margin (_tmp278_, 4); + _tmp279_ = self->priv->entryTextView; + gtk_text_view_set_right_margin (_tmp279_, 4); + _tmp280_ = self->priv->entryTextView; + gtk_text_view_set_accepts_tab (_tmp280_, TRUE); + _tmp281_ = (GtkScrolledWindow*) gtk_scrolled_window_new (NULL, NULL); + _tmp282_ = g_object_ref_sink (_tmp281_); + _g_object_unref0 (self->priv->scroll); + self->priv->scroll = _tmp282_; _tmp283_ = self->priv->scroll; - gtk_box_pack_start (_tmp282_, (GtkWidget*) _tmp283_, TRUE, TRUE, (guint) 0); - _tmp284_ = (GtkButton*) gtk_button_new_with_label ("Today"); - _tmp285_ = g_object_ref_sink (_tmp284_); - _data1_->btnToday = _tmp285_; - _tmp286_ = _data1_->btnToday; - g_signal_connect_data (_tmp286_, "clicked", (GCallback) ___lambda38__gtk_button_clicked, block1_data_ref (_data1_), (GClosureNotify) block1_data_unref, 0); - _tmp287_ = (GtkCalendar*) gtk_calendar_new (); - _tmp288_ = g_object_ref_sink (_tmp287_); + gtk_scrolled_window_set_shadow_type (_tmp283_, GTK_SHADOW_ETCHED_OUT); + _tmp284_ = self->priv->scroll; + gtk_scrolled_window_set_policy (_tmp284_, GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); + _tmp285_ = self->priv->scroll; + gtk_scrolled_window_set_min_content_width (_tmp285_, 251); + _tmp286_ = self->priv->scroll; + gtk_scrolled_window_set_min_content_height (_tmp286_, 280); + _tmp287_ = self->priv->scroll; + _tmp288_ = self->priv->entryTextView; + gtk_container_add ((GtkContainer*) _tmp287_, (GtkWidget*) _tmp288_); + _tmp289_ = self->priv->scroll; + g_object_set ((GtkWidget*) _tmp289_, "expand", TRUE, NULL); + _tmp290_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); + _tmp291_ = g_object_ref_sink (_tmp290_); + entryBox = _tmp291_; + _tmp292_ = entryBox; + _tmp293_ = self->priv->scroll; + gtk_box_pack_start (_tmp292_, (GtkWidget*) _tmp293_, TRUE, TRUE, (guint) 0); + _tmp294_ = (GtkButton*) gtk_button_new_with_label ("Today"); + _tmp295_ = g_object_ref_sink (_tmp294_); + _data1_->btnToday = _tmp295_; + _tmp296_ = _data1_->btnToday; + g_signal_connect_data (_tmp296_, "clicked", (GCallback) ___lambda40__gtk_button_clicked, block1_data_ref (_data1_), (GClosureNotify) block1_data_unref, 0); + _tmp297_ = (GtkCalendar*) gtk_calendar_new (); + _tmp298_ = g_object_ref_sink (_tmp297_); _g_object_unref0 (self->priv->calendar); - self->priv->calendar = _tmp288_; - _tmp289_ = self->priv->calendar; - g_object_set ((GtkWidget*) _tmp289_, "expand", FALSE, NULL); + self->priv->calendar = _tmp298_; + _tmp299_ = self->priv->calendar; + g_object_set ((GtkWidget*) _tmp299_, "expand", FALSE, NULL); main_resetCalendarFont (self); - _tmp290_ = self->priv->calendar; - g_signal_connect_object (_tmp290_, "day-selected", (GCallback) ___lambda39__gtk_calendar_day_selected, self, 0); - _tmp291_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2); - _tmp292_ = g_object_ref_sink (_tmp291_); - hbox = _tmp292_; - _tmp293_ = hbox; - _tmp294_ = entryBox; - gtk_box_pack_start (_tmp293_, (GtkWidget*) _tmp294_, TRUE, TRUE, (guint) 2); - _tmp295_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); - _tmp296_ = g_object_ref_sink (_tmp295_); - calendarBox = _tmp296_; - _tmp297_ = calendarBox; - _tmp298_ = _data1_->btnToday; - gtk_box_pack_start (_tmp297_, (GtkWidget*) _tmp298_, FALSE, FALSE, (guint) 0); - _tmp299_ = calendarBox; _tmp300_ = self->priv->calendar; - gtk_box_pack_start (_tmp299_, (GtkWidget*) _tmp300_, FALSE, FALSE, (guint) 2); - _tmp301_ = hbox; - _tmp302_ = calendarBox; - gtk_box_pack_start (_tmp301_, (GtkWidget*) _tmp302_, FALSE, FALSE, (guint) 2); - _tmp303_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); - _tmp304_ = g_object_ref_sink (_tmp303_); - vbox = _tmp304_; - _tmp305_ = hideMenubar; - if (!_tmp305_) { - GtkBox* _tmp306_; - GtkMenuBar* _tmp307_; - _tmp306_ = vbox; - _tmp307_ = self->priv->menubar; - gtk_box_pack_start (_tmp306_, (GtkWidget*) _tmp307_, FALSE, TRUE, (guint) 0); - } - _tmp308_ = vbox; - _tmp309_ = toolbar; - gtk_box_pack_start (_tmp308_, (GtkWidget*) _tmp309_, FALSE, TRUE, (guint) 0); - _tmp310_ = vbox; + g_signal_connect_object (_tmp300_, "day-selected", (GCallback) ___lambda41__gtk_calendar_day_selected, self, 0); + _tmp301_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2); + _tmp302_ = g_object_ref_sink (_tmp301_); + hbox = _tmp302_; + _tmp303_ = hbox; + _tmp304_ = entryBox; + gtk_box_pack_start (_tmp303_, (GtkWidget*) _tmp304_, TRUE, TRUE, (guint) 2); + _tmp305_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); + _tmp306_ = g_object_ref_sink (_tmp305_); + calendarBox = _tmp306_; + _tmp307_ = calendarBox; + _tmp308_ = _data1_->btnToday; + gtk_box_pack_start (_tmp307_, (GtkWidget*) _tmp308_, FALSE, FALSE, (guint) 0); + _tmp309_ = calendarBox; + _tmp310_ = self->priv->calendar; + gtk_box_pack_start (_tmp309_, (GtkWidget*) _tmp310_, FALSE, FALSE, (guint) 2); _tmp311_ = hbox; - gtk_box_pack_start (_tmp310_, (GtkWidget*) _tmp311_, TRUE, TRUE, (guint) 2); - _tmp312_ = vbox; - gtk_container_add ((GtkContainer*) self, (GtkWidget*) _tmp312_); + _tmp312_ = calendarBox; + gtk_box_pack_start (_tmp311_, (GtkWidget*) _tmp312_, FALSE, FALSE, (guint) 2); + _tmp313_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); + _tmp314_ = g_object_ref_sink (_tmp313_); + vbox = _tmp314_; + _tmp315_ = hideMenubar; + if (!_tmp315_) { + GtkBox* _tmp316_; + GtkMenuBar* _tmp317_; + _tmp316_ = vbox; + _tmp317_ = self->priv->menubar; + gtk_box_pack_start (_tmp316_, (GtkWidget*) _tmp317_, FALSE, TRUE, (guint) 0); + } + _tmp318_ = vbox; + _tmp319_ = toolbar; + gtk_box_pack_start (_tmp318_, (GtkWidget*) _tmp319_, FALSE, TRUE, (guint) 0); + _tmp320_ = vbox; + _tmp321_ = hbox; + gtk_box_pack_start (_tmp320_, (GtkWidget*) _tmp321_, TRUE, TRUE, (guint) 2); + _tmp322_ = vbox; + gtk_container_add ((GtkContainer*) self, (GtkWidget*) _tmp322_); main_setDjDirLocationMenuLabel (self); - _tmp313_ = user_data_get_fontSize (); - _tmp314_ = _tmp313_; - self->priv->fontSize = _tmp314_; - main_resetFontSize (self); - g_signal_connect_object ((GtkWidget*) self, "key-press-event", (GCallback) ___lambda40__gtk_widget_key_press_event, self, 0); - g_signal_connect_object ((GtkWidget*) self, "destroy", (GCallback) ___lambda41__gtk_widget_destroy, self, 0); + _tmp323_ = user_data_get_fontString (); + _tmp324_ = _tmp323_; + _tmp325_ = pango_font_description_from_string (_tmp324_); + font = _tmp325_; + _tmp326_ = self->priv->entryTextView; + gtk_widget_override_font ((GtkWidget*) _tmp326_, font); + g_signal_connect_object ((GtkWidget*) self, "key-press-event", (GCallback) ___lambda42__gtk_widget_key_press_event, self, 0); + g_signal_connect_object ((GtkWidget*) self, "destroy", (GCallback) ___lambda43__gtk_widget_destroy, self, 0); main_loadBlips (self); main_goToTodaysEntry (self); + _pango_font_description_free0 (font); _g_object_unref0 (vbox); _g_object_unref0 (calendarBox); _g_object_unref0 (hbox); @@ -1797,6 +1856,7 @@ _g_object_unref0 (menuAbout); _g_object_unref0 (menuKeyboardShortcuts); _g_object_unref0 (settingsMenuItem); + _g_object_unref0 (menuChooseFont); _g_object_unref0 (menuDecreaseCalendarFontSize); _g_object_unref0 (menuIncreaseCalendarFontSize); _g_object_unref0 (menuDecreaseFontSize); @@ -2718,8 +2778,7 @@ gchar* _tmp21_; gint _tmp22_; gint _tmp23_; - gint _tmp24_; - gint _tmp25_ = 0; + gint _tmp24_ = 0; _tmp10_ = self->priv->width; _tmp11_ = g_strdup_printf ("%i", _tmp10_); _tmp12_ = _tmp11_; @@ -2741,10 +2800,8 @@ _tmp22_ = self->priv->width; _tmp23_ = self->priv->height; user_data_saveWindowSize (_tmp22_, _tmp23_); - _tmp24_ = self->priv->fontSize; - user_data_saveFontSize (_tmp24_); - _tmp25_ = main_getCalendarFontSize (self); - user_data_saveCalendarFontSize (_tmp25_); + _tmp24_ = main_getCalendarFontSize (self); + user_data_saveCalendarFontSize (_tmp24_); } gtk_main_quit (); } @@ -3156,7 +3213,7 @@ switch (0) { default: { - main_resetFontSize (self); + main_clearFontPrefs (self); break; } } @@ -3273,15 +3330,19 @@ /** * Font size methods */ -static void main_resetFontSize (Main* self) { - gint _tmp0_; - gint _tmp1_; - gint _tmp2_; - g_return_if_fail (self != NULL); - _tmp0_ = user_data_get_fontSize (); - _tmp1_ = _tmp0_; - _tmp2_ = self->priv->fontSize; - main_changeFontSize (self, _tmp1_ - _tmp2_); +static gint main_getFontSize (Main* self) { + gint result = 0; + GtkTextView* _tmp0_; + GtkStyleContext* _tmp1_ = NULL; + const PangoFontDescription* _tmp2_ = NULL; + gint _tmp3_ = 0; + g_return_val_if_fail (self != NULL, 0); + _tmp0_ = self->priv->entryTextView; + _tmp1_ = gtk_widget_get_style_context ((GtkWidget*) _tmp0_); + _tmp2_ = gtk_style_context_get_font (_tmp1_, GTK_STATE_FLAG_NORMAL); + _tmp3_ = pango_font_description_get_size (_tmp2_); + result = _tmp3_ / PANGO_SCALE; + return result; } @@ -3303,70 +3364,131 @@ static void main_changeFontSize (Main* self, gint byThisMuch) { - gboolean _tmp0_ = FALSE; - gint _tmp1_; + gint _tmp0_ = 0; + gint fontSize; + gboolean _tmp1_ = FALSE; gint _tmp2_; - gboolean _tmp5_; - gint _tmp6_; + gint _tmp3_; + gboolean _tmp6_; gint _tmp7_; - GtkTextView* _tmp8_; - GtkStyle* _tmp9_; + gint _tmp8_; + GtkTextView* _tmp9_; GtkStyle* _tmp10_; - GtkStyleContext* _tmp11_ = NULL; - GtkStyleContext* _tmp12_; + GtkStyle* _tmp11_; + GtkStyleContext* _tmp12_ = NULL; GtkStyleContext* _tmp13_; - const PangoFontDescription* _tmp14_ = NULL; - PangoFontDescription* _tmp15_; + GtkStyleContext* _tmp14_; + const PangoFontDescription* _tmp15_ = NULL; PangoFontDescription* _tmp16_; + PangoFontDescription* _tmp17_; PangoFontDescription* font; - gint _tmp17_; + gint _tmp18_; gdouble newFontSize; - const PangoFontDescription* _tmp18_; - gdouble _tmp19_; - GtkTextView* _tmp20_; - const PangoFontDescription* _tmp21_; + const PangoFontDescription* _tmp19_; + gdouble _tmp20_; + GtkTextView* _tmp21_; + const PangoFontDescription* _tmp22_; + const PangoFontDescription* _tmp23_; + gchar* _tmp24_ = NULL; + gchar* _tmp25_; g_return_if_fail (self != NULL); - _tmp1_ = self->priv->fontSize; - _tmp2_ = byThisMuch; - if ((_tmp1_ + _tmp2_) < 6) { - _tmp0_ = TRUE; + _tmp0_ = main_getFontSize (self); + fontSize = _tmp0_; + _tmp2_ = fontSize; + _tmp3_ = byThisMuch; + if ((_tmp2_ + _tmp3_) < 6) { + _tmp1_ = TRUE; } else { - gint _tmp3_; gint _tmp4_; - _tmp3_ = self->priv->fontSize; - _tmp4_ = byThisMuch; - _tmp0_ = (_tmp3_ + _tmp4_) > 50; + gint _tmp5_; + _tmp4_ = fontSize; + _tmp5_ = byThisMuch; + _tmp1_ = (_tmp4_ + _tmp5_) > 50; } - _tmp5_ = _tmp0_; - if (_tmp5_) { + _tmp6_ = _tmp1_; + if (_tmp6_) { return; } - _tmp6_ = self->priv->fontSize; - _tmp7_ = byThisMuch; - self->priv->fontSize = _tmp6_ + _tmp7_; - _tmp8_ = self->priv->entryTextView; - _tmp9_ = gtk_widget_get_style ((GtkWidget*) _tmp8_); - _tmp10_ = _tmp9_; - g_object_get (_tmp10_, "context", &_tmp11_, NULL); - _tmp12_ = _tmp11_; + _tmp7_ = fontSize; + _tmp8_ = byThisMuch; + fontSize = _tmp7_ + _tmp8_; + _tmp9_ = self->priv->entryTextView; + _tmp10_ = gtk_widget_get_style ((GtkWidget*) _tmp9_); + _tmp11_ = _tmp10_; + g_object_get (_tmp11_, "context", &_tmp12_, NULL); _tmp13_ = _tmp12_; - _tmp14_ = gtk_style_context_get_font (_tmp13_, GTK_STATE_FLAG_NORMAL); - _tmp15_ = _pango_font_description_copy0 (_tmp14_); - _tmp16_ = _tmp15_; - _g_object_unref0 (_tmp13_); - font = _tmp16_; - _tmp17_ = self->priv->fontSize; - newFontSize = (gdouble) (_tmp17_ * PANGO_SCALE); - _tmp18_ = font; - _tmp19_ = newFontSize; - pango_font_description_set_size (_tmp18_, (gint) _tmp19_); - _tmp20_ = self->priv->entryTextView; - _tmp21_ = font; - gtk_widget_modify_font ((GtkWidget*) _tmp20_, _tmp21_); + _tmp14_ = _tmp13_; + _tmp15_ = gtk_style_context_get_font (_tmp14_, GTK_STATE_FLAG_NORMAL); + _tmp16_ = _pango_font_description_copy0 (_tmp15_); + _tmp17_ = _tmp16_; + _g_object_unref0 (_tmp14_); + font = _tmp17_; + _tmp18_ = fontSize; + newFontSize = (gdouble) (_tmp18_ * PANGO_SCALE); + _tmp19_ = font; + _tmp20_ = newFontSize; + pango_font_description_set_size (_tmp19_, (gint) _tmp20_); + _tmp21_ = self->priv->entryTextView; + _tmp22_ = font; + gtk_widget_override_font ((GtkWidget*) _tmp21_, _tmp22_); + _tmp23_ = font; + _tmp24_ = pango_font_description_to_string (_tmp23_); + _tmp25_ = _tmp24_; + user_data_setFont (_tmp25_); + _g_free0 (_tmp25_); _pango_font_description_free0 (font); } +static void main_clearFontPrefs (Main* self) { + GtkTextView* _tmp0_; + gint _tmp1_ = 0; + g_return_if_fail (self != NULL); + user_data_setFont (""); + _tmp0_ = self->priv->entryTextView; + gtk_widget_override_font ((GtkWidget*) _tmp0_, NULL); + _tmp1_ = main_getFontSize (self); + main_changeFontSize (self, 10 - _tmp1_); +} + + +static void main_chooseFont (Main* self) { + GtkFontChooserDialog* _tmp0_; + GtkFontChooserDialog* _tmp1_; + GtkFontChooserDialog* dialog; + GtkFontChooserDialog* _tmp2_; + gint _tmp3_ = 0; + GtkFontChooserDialog* _tmp11_; + g_return_if_fail (self != NULL); + _tmp0_ = (GtkFontChooserDialog*) gtk_font_chooser_dialog_new ("Choose Entry Font", (GtkWindow*) self); + _tmp1_ = g_object_ref_sink (_tmp0_); + dialog = _tmp1_; + _tmp2_ = dialog; + _tmp3_ = gtk_dialog_run ((GtkDialog*) _tmp2_); + if (_tmp3_ == ((gint) GTK_RESPONSE_OK)) { + GtkFontChooserDialog* _tmp4_; + const gchar* _tmp5_; + const gchar* _tmp6_; + GtkTextView* _tmp7_; + GtkFontChooserDialog* _tmp8_; + const PangoFontDescription* _tmp9_; + const PangoFontDescription* _tmp10_; + _tmp4_ = dialog; + _tmp5_ = gtk_font_chooser_get_font ((GtkFontChooser*) _tmp4_); + _tmp6_ = _tmp5_; + user_data_setFont (_tmp6_); + _tmp7_ = self->priv->entryTextView; + _tmp8_ = dialog; + _tmp9_ = gtk_font_chooser_get_font_desc ((GtkFontChooser*) _tmp8_); + _tmp10_ = _tmp9_; + gtk_widget_override_font ((GtkWidget*) _tmp7_, _tmp10_); + } + _tmp11_ = dialog; + g_signal_emit_by_name ((GtkDialog*) _tmp11_, "close"); + _g_object_unref0 (dialog); +} + + static void main_addDaysToSelectedDate (Main* self, gint days) { GtkCalendar* _tmp0_; gint _tmp1_ = 0; diff -Nru dayjournal-22.2.5/src/dayjournal.vala dayjournal-22.3.0/src/dayjournal.vala --- dayjournal-22.2.5/src/dayjournal.vala 2014-11-17 02:04:49.000000000 +0000 +++ dayjournal-22.3.0/src/dayjournal.vala 2014-11-21 02:24:51.000000000 +0000 @@ -51,7 +51,7 @@ private TextView entryTextView; // private int startingFontSize; - private int fontSize; +// private int fontSize; private bool isOpening; private bool needsSave = false; @@ -170,10 +170,15 @@ menuDecreaseCalendarFontSize.activate.connect(() => { this.decreaseCalendarFontSize(); }); + var menuChooseFont = new Gtk.MenuItem.with_label("Change Entry Font..."); + menuChooseFont.activate.connect(() => { + this.chooseFont(); + }); settingsMenu.append(menuUnlockEntry); settingsMenu.append(menuIncreaseFontSize); settingsMenu.append(menuDecreaseFontSize); settingsMenu.append(new SeparatorMenuItem()); + settingsMenu.append(menuChooseFont); settingsMenu.append(menuLockPastEntries); settingsMenu.append(new SeparatorMenuItem()); settingsMenu.append(menuIncreaseCalendarFontSize); @@ -316,11 +321,16 @@ menuDecreaseCalendarFontSize.activate.connect(() => { this.decreaseCalendarFontSize(); }); + menuChooseFont = new Gtk.MenuItem.with_label("Change Entry Font..."); + menuChooseFont.activate.connect(() => { + this.chooseFont(); + }); settingsMenu.append(menuCreateJournalArchive); settingsMenu.append(menuCreateJournalArchiveTxt); settingsMenu.append(menuOpenDjLocation); settingsMenu.append(new SeparatorMenuItem()); + settingsMenu.append(menuChooseFont); settingsMenu.append(menuLockPastEntries); settingsMenu.append(new SeparatorMenuItem()); settingsMenu.append(menuIncreaseCalendarFontSize); @@ -343,11 +353,8 @@ toolbar.insert(new SeparatorToolItem(), -1); toolbar.insert(addImageButton, -1); toolbar.insert(new SeparatorToolItem(), -1); - toolbar.insert(increaseFontSizeButton, -1); toolbar.insert(decreaseFontSizeButton, -1); -// toolbar.insert(this.completeButton, -1); -// toolbar.insert(this.deleteButton, -1); - // toolbar.insert(new Gtk.SeparatorToolItem(), -1); + toolbar.insert(increaseFontSizeButton, -1); var separator = new SeparatorToolItem(); toolbar.add(separator); toolbar.child_set_property(separator, "expand", true); @@ -409,8 +416,10 @@ this.setDjDirLocationMenuLabel(); //this.startingFontSize = 10; - this.fontSize = UserData.fontSize; - this.resetFontSize(); +// this.fontSize = UserData.fontSize; +// this.resetFontSize(); + var font = Pango.FontDescription.from_string(UserData.fontString); + this.entryTextView.override_font(font); // Zystem.debug("Font size is: " + this.fontSize.to_string()); @@ -621,7 +630,7 @@ UserData.saveWindowSize(this.width, this.height); // Save font size - UserData.saveFontSize(this.fontSize); +// UserData.saveFontSize(this.fontSize); // Save calendar font size UserData.saveCalendarFontSize(this.getCalendarFontSize()); @@ -762,7 +771,8 @@ this.decreaseFontSize(); break; case "0": - this.resetFontSize(); +// this.resetFontSize(); + this.clearFontPrefs(); break; case "p": this.chooseImage(); @@ -818,14 +828,12 @@ /** * Font size methods */ - private void resetFontSize() { - /* Pango.FontDescription font = this.entryTextView.style.context.get_font(StateFlags.NORMAL); - // font.set_size(this.startingFontSize); - font.set_size((int)(this.startingFontSize * Pango.SCALE)); - this.entryTextView.modify_font(font); - // Zystem.debug("The font size is: " + font.get_size().to_string()); */ - //this.changeFontSize(this.startingFontSize - this.fontSize); + /*private void resetFontSize() { this.changeFontSize(UserData.fontSize - this.fontSize); + }*/ + + private int getFontSize() { + return this.entryTextView.get_style_context().get_font(StateFlags.NORMAL).get_size() / Pango.SCALE; } private void increaseFontSize() { @@ -836,24 +844,39 @@ } private void changeFontSize(int byThisMuch) { + int fontSize = this.getFontSize(); + // If font would be too small or too big, no way man - if (this.fontSize + byThisMuch < 6 || this.fontSize + byThisMuch > 50) { -// Zystem.debug("Not changing font size, because it would be: " + this.fontSize.to_string()); + if (fontSize + byThisMuch < 6 || fontSize + byThisMuch > 50) { +// Zystem.debug("Not changing font size, because it would be: " + fontSize.to_string()); return; } - this.fontSize += byThisMuch; -// Zystem.debug("Changing font size to: " + this.fontSize.to_string()); + fontSize += byThisMuch; +// Zystem.debug("Changing font size to: " + fontSize.to_string()); Pango.FontDescription font = this.entryTextView.style.context.get_font(StateFlags.NORMAL); - double newFontSize = (this.fontSize) * Pango.SCALE; + double newFontSize = (fontSize) * Pango.SCALE; font.set_size((int)newFontSize); - this.entryTextView.modify_font(font); + this.entryTextView.override_font(font); + UserData.setFont(font.to_string()); + } + + private void clearFontPrefs() { + UserData.setFont(""); + this.entryTextView.override_font(null); + this.changeFontSize(10 - this.getFontSize()); + } + + private void chooseFont() { + Gtk.FontChooserDialog dialog = new Gtk.FontChooserDialog ("Choose Entry Font", this); + if (dialog.run () == Gtk.ResponseType.OK) { + UserData.setFont(dialog.font); + this.entryTextView.override_font(dialog.font_desc); + } - /*var docfont=new Pango.FontDescription(); - docfont.set_family("Ubuntu"); - docfont.set_size(14000); - this.entryTextView.modify_font(docfont);*/ + // Close the FontChooserDialog + dialog.close (); } /* diff -Nru dayjournal-22.2.5/src/UserData.c dayjournal-22.3.0/src/UserData.c --- dayjournal-22.2.5/src/UserData.c 2014-04-05 19:44:22.000000000 +0000 +++ dayjournal-22.3.0/src/UserData.c 2014-11-20 17:23:00.000000000 +0000 @@ -95,6 +95,8 @@ static gint user_data__calendarFontSize = 0; static gboolean user_data__rememberCurrentJournalAfterInit; static gboolean user_data__rememberCurrentJournalAfterInit = FALSE; +static gchar* user_data__fontString; +static gchar* user_data__fontString = NULL; static UserSettingsManager* user_data_settings; static UserSettingsManager* user_data_settings = NULL; @@ -145,9 +147,6 @@ #define USER_SETTINGS_MANAGER_windowWidthKey "width" gint user_data_get_windowHeight (void); #define USER_SETTINGS_MANAGER_windowHeightKey "height" -void user_data_saveFontSize (gint size); -gint user_data_get_fontSize (void); -#define USER_SETTINGS_MANAGER_fontSizeKey "fontSize" void user_data_saveCalendarFontSize (gint size); #define USER_SETTINGS_MANAGER_calendarFontSizeKey "calFontSize" gchar* user_data_getArchiveDirPath (void); @@ -169,6 +168,10 @@ void user_data_showNotification (const gchar* title, const gchar* message); gchar* user_data_getDayOneEntriesDir (void); gchar* user_data_getDayOnePhotosDir (void); +void user_data_setFont (const gchar* fontStr); +#define USER_SETTINGS_MANAGER_fontKey "font" +const gchar* user_data_get_fontString (void); +void user_data_set_fontString (const gchar* value); UserData* user_data_new (void); UserData* user_data_construct (GType object_type); gint64 user_data_get_lastBlipLoadDate (void); @@ -177,6 +180,7 @@ void user_data_set_newEntrySectionText (const gchar* value); void user_data_set_windowWidth (gint value); void user_data_set_windowHeight (gint value); +gint user_data_get_fontSize (void); void user_data_set_fontSize (gint value); void user_data_set_rememberCurrentJournalAfterInit (gboolean value); static void user_data_finalize (GObject* obj); @@ -578,23 +582,6 @@ } -void user_data_saveFontSize (gint size) { - gint _tmp0_; - gint _tmp1_; - gint _tmp2_; - _tmp0_ = user_data_get_fontSize (); - _tmp1_ = _tmp0_; - _tmp2_ = size; - if (_tmp1_ != _tmp2_) { - UserSettingsManager* _tmp3_; - gint _tmp4_; - _tmp3_ = user_data_settings; - _tmp4_ = size; - user_settings_manager_setInt (_tmp3_, USER_SETTINGS_MANAGER_fontSizeKey, _tmp4_); - } -} - - void user_data_saveCalendarFontSize (gint size) { gint _tmp0_; gint _tmp1_; @@ -813,6 +800,23 @@ } +void user_data_setFont (const gchar* fontStr) { + UserSettingsManager* _tmp0_; + const gchar* _tmp1_; + const gchar* _tmp2_; + const gchar* _tmp3_; + const gchar* _tmp4_; + g_return_if_fail (fontStr != NULL); + _tmp0_ = user_data_settings; + _tmp1_ = fontStr; + user_settings_manager_setString (_tmp0_, USER_SETTINGS_MANAGER_fontKey, _tmp1_); + _tmp2_ = user_data_get_fontString (); + _tmp3_ = _tmp2_; + _tmp4_ = fontStr; + user_data_set_fontString (_tmp4_); +} + + UserData* user_data_construct (GType object_type) { UserData * self = NULL; self = (UserData*) g_object_new (object_type, NULL); @@ -1067,11 +1071,33 @@ } +const gchar* user_data_get_fontString (void) { + const gchar* result; + const gchar* _tmp0_; + _tmp0_ = user_data__fontString; + result = _tmp0_; + return result; +} + + +void user_data_set_fontString (const gchar* value) { + const gchar* _tmp0_; + gchar* _tmp1_; + _tmp0_ = value; + _tmp1_ = g_strdup (_tmp0_); + _g_free0 (user_data__fontString); + user_data__fontString = _tmp1_; +} + + static void user_data_class_init (UserDataClass * klass) { + gchar* _tmp0_; user_data_parent_class = g_type_class_peek_parent (klass); G_OBJECT_CLASS (klass)->get_property = _vala_user_data_get_property; G_OBJECT_CLASS (klass)->set_property = _vala_user_data_set_property; G_OBJECT_CLASS (klass)->finalize = user_data_finalize; + _tmp0_ = g_strdup (""); + user_data__fontString = _tmp0_; } diff -Nru dayjournal-22.2.5/src/UserData.vala dayjournal-22.3.0/src/UserData.vala --- dayjournal-22.2.5/src/UserData.vala 2014-04-05 19:44:17.000000000 +0000 +++ dayjournal-22.3.0/src/UserData.vala 2014-11-20 17:21:50.000000000 +0000 @@ -37,6 +37,7 @@ public static const int defaultFontSize = 10; public static int calendarFontSize { get; set; } public static bool rememberCurrentJournalAfterInit { get; set; default = false; } + public static string fontString { get; set; default = ""; } private static UserSettingsManager settings; @@ -145,11 +146,11 @@ } } - public static void saveFontSize(int size) { + /*public static void saveFontSize(int size) { if (fontSize != size) { settings.setInt(UserSettingsManager.fontSizeKey, size); } - } + }*/ public static void saveCalendarFontSize(int size) { if (calendarFontSize != size) { @@ -216,5 +217,10 @@ public static string getDayOnePhotosDir() { return FileUtility.pathCombine(homeDirPath, "Dropbox/Apps/Day One/Journal.dayone/photos"); } + + public static void setFont(string fontStr) { + settings.setString(UserSettingsManager.fontKey, fontStr); + fontString = fontStr; + } } diff -Nru dayjournal-22.2.5/src/UserSettingsManager.c dayjournal-22.3.0/src/UserSettingsManager.c --- dayjournal-22.2.5/src/UserSettingsManager.c 2014-04-05 19:44:22.000000000 +0000 +++ dayjournal-22.3.0/src/UserSettingsManager.c 2014-11-20 17:23:00.000000000 +0000 @@ -76,9 +76,9 @@ #define USER_SETTINGS_MANAGER_windowWidthKey "width" #define USER_SETTINGS_MANAGER_windowHeightKey "height" #define USER_SETTINGS_MANAGER_calendarFontSizeKey "calFontSize" -#define USER_SETTINGS_MANAGER_fontSizeKey "fontSize" #define USER_SETTINGS_MANAGER_lastBlipLoadDateKey "lastBlipLoadDate" #define USER_SETTINGS_MANAGER_NONE "NONE" +#define USER_SETTINGS_MANAGER_fontKey "font" UserSettingsManager* user_settings_manager_new (void); UserSettingsManager* user_settings_manager_construct (GType object_type); const gchar* user_data_get_homeDirPath (void); @@ -103,8 +103,8 @@ void zystem_debug (const gchar* s); gint user_data_get_calendarFontSize (void); void user_data_set_calendarFontSize (gint value); -gint user_data_get_fontSize (void); -void user_data_set_fontSize (gint value); +const gchar* user_data_get_fontString (void); +void user_data_set_fontString (const gchar* value); gint64 user_data_get_lastBlipLoadDate (void); void user_data_set_lastBlipLoadDate (gint64 value); void user_settings_manager_setDjDir (UserSettingsManager* self, const gchar* path); @@ -264,11 +264,11 @@ GKeyFile* _tmp0_; gchar* _tmp1_ = NULL; gchar* originalKeyFileData; - const gchar* _tmp66_; - GKeyFile* _tmp67_; - gchar* _tmp68_ = NULL; - gchar* _tmp69_; - gboolean _tmp70_; + const gchar* _tmp69_; + GKeyFile* _tmp70_; + gchar* _tmp71_ = NULL; + gchar* _tmp72_; + gboolean _tmp73_; GError * _inner_error_ = NULL; g_return_val_if_fail (self != NULL, FALSE); _tmp0_ = self->priv->keyFile; @@ -564,12 +564,13 @@ } { GKeyFile* _tmp54_; - gint _tmp55_ = 0; - gint _tmp56_; - gint _tmp57_; - gint _tmp58_; + gchar* _tmp55_ = NULL; + gchar* _tmp56_; + const gchar* _tmp57_; + const gchar* _tmp58_; + gchar* _tmp59_; _tmp54_ = self->priv->keyFile; - _tmp55_ = g_key_file_get_integer (_tmp54_, USER_SETTINGS_MANAGER_djGroup, USER_SETTINGS_MANAGER_fontSizeKey, &_inner_error_); + _tmp55_ = g_key_file_get_string (_tmp54_, USER_SETTINGS_MANAGER_djGroup, USER_SETTINGS_MANAGER_fontKey, &_inner_error_); _tmp56_ = _tmp55_; if (_inner_error_ != NULL) { if (_inner_error_->domain == G_KEY_FILE_ERROR) { @@ -580,17 +581,23 @@ g_clear_error (&_inner_error_); return FALSE; } - _tmp57_ = user_data_get_fontSize (); + _tmp57_ = user_data_get_fontString (); _tmp58_ = _tmp57_; - user_data_set_fontSize (_tmp56_); + _tmp59_ = _tmp56_; + user_data_set_fontString (_tmp59_); + _g_free0 (_tmp59_); } goto __finally17; __catch17_g_key_file_error: { GError* e = NULL; + const gchar* _tmp60_; + const gchar* _tmp61_; e = _inner_error_; _inner_error_ = NULL; - zystem_debug ("No saved font size."); + _tmp60_ = user_data_get_fontString (); + _tmp61_ = _tmp60_; + user_data_set_fontString (""); _g_error_free0 (e); } __finally17: @@ -601,16 +608,16 @@ return FALSE; } { - GKeyFile* _tmp59_; - gchar* _tmp60_ = NULL; - gchar* _tmp61_; - gint64 _tmp62_; - gint64 _tmp63_; + GKeyFile* _tmp62_; + gchar* _tmp63_ = NULL; gchar* _tmp64_; - gint64 _tmp65_ = 0LL; - _tmp59_ = self->priv->keyFile; - _tmp60_ = g_key_file_get_string (_tmp59_, USER_SETTINGS_MANAGER_djGroup, USER_SETTINGS_MANAGER_lastBlipLoadDateKey, &_inner_error_); - _tmp61_ = _tmp60_; + gint64 _tmp65_; + gint64 _tmp66_; + gchar* _tmp67_; + gint64 _tmp68_ = 0LL; + _tmp62_ = self->priv->keyFile; + _tmp63_ = g_key_file_get_string (_tmp62_, USER_SETTINGS_MANAGER_djGroup, USER_SETTINGS_MANAGER_lastBlipLoadDateKey, &_inner_error_); + _tmp64_ = _tmp63_; if (_inner_error_ != NULL) { if (_inner_error_->domain == G_KEY_FILE_ERROR) { goto __catch18_g_key_file_error; @@ -620,12 +627,12 @@ g_clear_error (&_inner_error_); return FALSE; } - _tmp62_ = user_data_get_lastBlipLoadDate (); - _tmp63_ = _tmp62_; - _tmp64_ = _tmp61_; - _tmp65_ = int64_parse (_tmp64_); - user_data_set_lastBlipLoadDate (_tmp65_); - _g_free0 (_tmp64_); + _tmp65_ = user_data_get_lastBlipLoadDate (); + _tmp66_ = _tmp65_; + _tmp67_ = _tmp64_; + _tmp68_ = int64_parse (_tmp67_); + user_data_set_lastBlipLoadDate (_tmp68_); + _g_free0 (_tmp67_); } goto __finally18; __catch18_g_key_file_error: @@ -643,13 +650,13 @@ g_clear_error (&_inner_error_); return FALSE; } - _tmp66_ = originalKeyFileData; - _tmp67_ = self->priv->keyFile; - _tmp68_ = g_key_file_to_data (_tmp67_, NULL, NULL); - _tmp69_ = _tmp68_; - _tmp70_ = g_strcmp0 (_tmp66_, _tmp69_) != 0; - _g_free0 (_tmp69_); - result = _tmp70_; + _tmp69_ = originalKeyFileData; + _tmp70_ = self->priv->keyFile; + _tmp71_ = g_key_file_to_data (_tmp70_, NULL, NULL); + _tmp72_ = _tmp71_; + _tmp73_ = g_strcmp0 (_tmp69_, _tmp72_) != 0; + _g_free0 (_tmp72_); + result = _tmp73_; _g_free0 (originalKeyFileData); return result; } @@ -792,7 +799,7 @@ return; } _tmp3_ = self->priv->keyFile; - g_key_file_remove_key (_tmp3_, USER_SETTINGS_MANAGER_djGroup, USER_SETTINGS_MANAGER_fontSizeKey, &_inner_error_); + g_key_file_remove_key (_tmp3_, USER_SETTINGS_MANAGER_djGroup, USER_SETTINGS_MANAGER_fontKey, &_inner_error_); if (_inner_error_ != NULL) { if (_inner_error_->domain == G_KEY_FILE_ERROR) { goto __catch20_g_key_file_error; diff -Nru dayjournal-22.2.5/src/UserSettingsManager.vala dayjournal-22.3.0/src/UserSettingsManager.vala --- dayjournal-22.2.5/src/UserSettingsManager.vala 2014-04-05 19:44:20.000000000 +0000 +++ dayjournal-22.3.0/src/UserSettingsManager.vala 2014-11-20 17:20:44.000000000 +0000 @@ -40,9 +40,10 @@ public static const string windowWidthKey = "width"; public static const string windowHeightKey = "height"; public static const string calendarFontSizeKey = "calFontSize"; - public static const string fontSizeKey = "fontSize"; +// public static const string fontSizeKey = "fontSize"; public static const string lastBlipLoadDateKey = "lastBlipLoadDate"; public static const string NONE = "NONE"; + public static const string fontKey = "font"; /** * Constructor. @@ -131,10 +132,16 @@ Zystem.debug("No saved calendar font size."); } - try { + /*try { UserData.fontSize = keyFile.get_integer(djGroup , fontSizeKey); } catch (KeyFileError e) { Zystem.debug("No saved font size."); + }*/ + + try { + UserData.fontString = keyFile.get_string(djGroup, fontKey); + } catch (KeyFileError e) { + UserData.fontString = ""; } try { @@ -193,7 +200,8 @@ keyFile.remove_key(djGroup, windowWidthKey); keyFile.remove_key(djGroup, windowHeightKey); keyFile.remove_key(djGroup, calendarFontSizeKey); - keyFile.remove_key(djGroup, fontSizeKey); +// keyFile.remove_key(djGroup, fontSizeKey); + keyFile.remove_key(djGroup, fontKey); this.writeKeyFile(); } catch (KeyFileError e) { Zystem.debug("Failed to delete some settings.");