From f06c6922957195016b29958ef15356f899435481 Mon Sep 17 00:00:00 2001 From: riderkick Date: Mon, 6 Feb 2017 08:39:28 +0800 Subject: [PATCH] added option to open favorites at startup if check favorites checked. closed #478 --- mangadownloader/forms/frmMain.lfm | 64 +++++++++++++++----------- mangadownloader/forms/frmMain.lrj | 1 + mangadownloader/forms/frmMain.pas | 15 +++++- mangadownloader/languages/fmd.en.po | 4 ++ mangadownloader/languages/fmd.id_ID.po | 4 ++ mangadownloader/languages/fmd.pl_PL.po | 5 ++ mangadownloader/languages/fmd.po | 4 ++ 7 files changed, 69 insertions(+), 28 deletions(-) diff --git a/mangadownloader/forms/frmMain.lfm b/mangadownloader/forms/frmMain.lfm index 4ff2a3ae..f220c9be 100644 --- a/mangadownloader/forms/frmMain.lfm +++ b/mangadownloader/forms/frmMain.lfm @@ -14,7 +14,6 @@ object MainForm: TMainForm OnWindowStateChange = FormWindowStateChange Position = poScreenCenter ShowHint = True - LCLVersion = '1.7' Visible = False object sbUpdateList: TStatusBar Left = 0 @@ -2580,7 +2579,7 @@ object MainForm: TMainForm Left = 4 Height = 105 Top = 155 - Width = 403 + Width = 402 AutoSize = True Caption = 'Proxy config' ChildSizing.LeftRightSpacing = 4 @@ -2590,7 +2589,7 @@ object MainForm: TMainForm ChildSizing.Layout = cclLeftToRightThenTopToBottom ChildSizing.ControlsPerLine = 4 ClientHeight = 85 - ClientWidth = 399 + ClientWidth = 398 Enabled = False ParentFont = False TabOrder = 1 @@ -2598,13 +2597,13 @@ object MainForm: TMainForm Left = 4 Height = 23 Top = 4 - Width = 26 + Width = 25 Caption = 'Host' ParentColor = False ParentFont = False end object edOptionHost: TEdit - Left = 34 + Left = 33 Height = 23 Top = 4 Width = 150 @@ -2619,7 +2618,7 @@ object MainForm: TMainForm object lbOptionUser: TLabel AnchorSideLeft.Side = asrBottom AnchorSideTop.Side = asrBottom - Left = 188 + Left = 187 Height = 23 Top = 4 Width = 53 @@ -2629,7 +2628,7 @@ object MainForm: TMainForm object edOptionUser: TEdit AnchorSideLeft.Side = asrBottom AnchorSideTop.Side = asrBottom - Left = 245 + Left = 244 Height = 23 Top = 4 Width = 150 @@ -2645,12 +2644,12 @@ object MainForm: TMainForm Left = 4 Height = 23 Top = 31 - Width = 26 + Width = 25 Caption = 'Port' ParentColor = False end object edOptionPort: TEdit - Left = 34 + Left = 33 Height = 23 Top = 31 Width = 150 @@ -2664,7 +2663,7 @@ object MainForm: TMainForm object lbOptionPass: TLabel AnchorSideLeft.Side = asrBottom AnchorSideTop.Side = asrBottom - Left = 188 + Left = 187 Height = 23 Top = 31 Width = 53 @@ -2674,7 +2673,7 @@ object MainForm: TMainForm object edOptionPass: TEdit AnchorSideLeft.Side = asrBottom AnchorSideTop.Side = asrBottom - Left = 245 + Left = 244 Height = 23 Top = 31 Width = 150 @@ -2689,12 +2688,12 @@ object MainForm: TMainForm Left = 4 Height = 23 Top = 58 - Width = 26 + Width = 25 Caption = 'Type' ParentColor = False end object cbOptionProxyType: TComboBox - Left = 34 + Left = 33 Height = 23 Top = 58 Width = 150 @@ -3301,7 +3300,7 @@ object MainForm: TMainForm end object gbOptionFavorites: TGroupBox Left = 4 - Height = 143 + Height = 166 Top = 31 Width = 523 Align = alTop @@ -3311,7 +3310,7 @@ object MainForm: TMainForm ChildSizing.TopBottomSpacing = 4 ChildSizing.HorizontalSpacing = 4 ChildSizing.VerticalSpacing = 4 - ClientHeight = 123 + ClientHeight = 146 ClientWidth = 519 ParentFont = False TabOrder = 1 @@ -3322,8 +3321,9 @@ object MainForm: TMainForm Width = 511 Align = alTop Caption = 'Auto check for new chapter at startup' + OnChange = cbOptionAutoCheckFavStartupChange ParentFont = False - TabOrder = 3 + TabOrder = 0 end object seOptionAutoCheckFavIntervalMinutes: TSpinEdit AnchorSideLeft.Control = cbOptionAutoCheckFavInterval @@ -3331,12 +3331,12 @@ object MainForm: TMainForm AnchorSideTop.Side = asrBottom Left = 4 Height = 23 - Top = 50 + Top = 73 Width = 58 MaxValue = 1440 MinValue = 1 OnChange = seOptionAutoCheckFavIntervalMinutesChange - TabOrder = 0 + TabOrder = 3 Value = 1 end object lbOptionAutoCheckFavIntervalMinutes: TLabel @@ -3346,7 +3346,7 @@ object MainForm: TMainForm AnchorSideTop.Side = asrCenter Left = 66 Height = 15 - Top = 54 + Top = 77 Width = 243 Caption = 'Auto check for new chapter every %d minutes' ParentColor = False @@ -3357,10 +3357,10 @@ object MainForm: TMainForm AnchorSideTop.Side = asrBottom Left = 4 Height = 19 - Top = 100 + Top = 123 Width = 298 Caption = 'Automatic remove completed manga from Favorites' - TabOrder = 1 + TabOrder = 5 end object cbOptionAutoCheckFavDownload: TCheckBox AnchorSideLeft.Control = seOptionAutoCheckFavIntervalMinutes @@ -3368,28 +3368,38 @@ object MainForm: TMainForm AnchorSideTop.Side = asrBottom Left = 4 Height = 19 - Top = 77 + Top = 100 Width = 242 Caption = 'Automatic download after finish checking' ParentFont = False - TabOrder = 2 + TabOrder = 4 end object cbOptionAutoCheckFavInterval: TCheckBox Left = 4 Height = 19 - Top = 27 + Top = 50 Width = 511 Align = alTop Caption = 'Auto check for new chapter in an interval' OnChange = cbOptionAutoCheckFavIntervalChange ParentFont = False - TabOrder = 4 + TabOrder = 2 + end + object cbOptionAutoOpenFavStartup: TCheckBox + Left = 4 + Height = 19 + Top = 27 + Width = 511 + Align = alTop + Caption = 'Open Favorites at startup' + ParentFont = False + TabOrder = 1 end end object cbOptionUpdateListNoMangaInfo: TCheckBox Left = 4 Height = 19 - Top = 178 + Top = 201 Width = 523 Align = alTop Caption = 'Don''t load manga information when updating list (filter will be not work!)' @@ -3399,7 +3409,7 @@ object MainForm: TMainForm object cbOptionUpdateListRemoveDuplicateLocalData: TCheckBox Left = 4 Height = 19 - Top = 201 + Top = 224 Width = 523 Align = alTop Caption = 'Remove duplicate local data when updating manga list' diff --git a/mangadownloader/forms/frmMain.lrj b/mangadownloader/forms/frmMain.lrj index 27fcfc56..179644a1 100644 --- a/mangadownloader/forms/frmMain.lrj +++ b/mangadownloader/forms/frmMain.lrj @@ -205,6 +205,7 @@ {"hash":234489075,"name":"tmainform.cboptionautocheckfavremovecompletedmanga.caption","sourcebytes":[65,117,116,111,109,97,116,105,99,32,114,101,109,111,118,101,32,99,111,109,112,108,101,116,101,100,32,109,97,110,103,97,32,102,114,111,109,32,70,97,118,111,114,105,116,101,115],"value":"Automatic remove completed manga from Favorites"}, {"hash":44744407,"name":"tmainform.cboptionautocheckfavdownload.caption","sourcebytes":[65,117,116,111,109,97,116,105,99,32,100,111,119,110,108,111,97,100,32,97,102,116,101,114,32,102,105,110,105,115,104,32,99,104,101,99,107,105,110,103],"value":"Automatic download after finish checking"}, {"hash":248673660,"name":"tmainform.cboptionautocheckfavinterval.caption","sourcebytes":[65,117,116,111,32,99,104,101,99,107,32,102,111,114,32,110,101,119,32,99,104,97,112,116,101,114,32,105,110,32,97,110,32,105,110,116,101,114,118,97,108],"value":"Auto check for new chapter in an interval"}, +{"hash":138709376,"name":"tmainform.cboptionautoopenfavstartup.caption","sourcebytes":[79,112,101,110,32,70,97,118,111,114,105,116,101,115,32,97,116,32,115,116,97,114,116,117,112],"value":"Open Favorites at startup"}, {"hash":9269721,"name":"tmainform.cboptionupdatelistnomangainfo.caption","sourcebytes":[68,111,110,39,116,32,108,111,97,100,32,109,97,110,103,97,32,105,110,102,111,114,109,97,116,105,111,110,32,119,104,101,110,32,117,112,100,97,116,105,110,103,32,108,105,115,116,32,40,102,105,108,116,101,114,32,119,105,108,108,32,98,101,32,110,111,116,32,119,111,114,107,33,41],"value":"Don't load manga information when updating list (filter will be not work!)"}, {"hash":182501908,"name":"tmainform.cboptionupdatelistremoveduplicatelocaldata.caption","sourcebytes":[82,101,109,111,118,101,32,100,117,112,108,105,99,97,116,101,32,108,111,99,97,108,32,100,97,116,97,32,119,104,101,110,32,117,112,100,97,116,105,110,103,32,109,97,110,103,97,32,108,105,115,116],"value":"Remove duplicate local data when updating manga list"}, {"hash":184038819,"name":"tmainform.tsdialogs.caption","sourcebytes":[68,105,97,108,111,103,115],"value":"Dialogs"}, diff --git a/mangadownloader/forms/frmMain.pas b/mangadownloader/forms/frmMain.pas index ac9e6da7..9665be88 100644 --- a/mangadownloader/forms/frmMain.pas +++ b/mangadownloader/forms/frmMain.pas @@ -51,6 +51,7 @@ type cbOptionAutoCheckFavInterval: TCheckBox; cbOptionAutoCheckFavDownload: TCheckBox; cbOptionAutoCheckFavRemoveCompletedManga: TCheckBox; + cbOptionAutoOpenFavStartup: TCheckBox; cbOptionEnableLoadCover: TCheckBox; cbOptionGenerateChapterFolder: TCheckBox; cbOptionRemoveMangaNameFromChapter: TCheckBox; @@ -397,6 +398,7 @@ type procedure btVisitMyBlogClick(Sender: TObject); procedure cbAddAsStoppedChange(Sender: TObject); procedure cbOptionAutoCheckFavIntervalChange(Sender: TObject); + procedure cbOptionAutoCheckFavStartupChange(Sender: TObject); procedure cbOptionChangeUnicodeCharacterChange(Sender: TObject); procedure cbOptionDigitChapterChange(Sender: TObject); procedure cbOptionDigitVolumeChange(Sender: TObject); @@ -2220,6 +2222,11 @@ begin lbOptionAutoCheckFavIntervalMinutes.Enabled := cbOptionAutoCheckFavInterval.Checked; end; +procedure TMainForm.cbOptionAutoCheckFavStartupChange(Sender: TObject); +begin + cbOptionAutoOpenFavStartup.Enabled := cbOptionAutoCheckFavStartup.Checked; +end; + procedure TMainForm.cbOptionChangeUnicodeCharacterChange(Sender: TObject); begin edOptionChangeUnicodeCharacterStr.Enabled := cbOptionChangeUnicodeCharacter.Checked; @@ -4565,6 +4572,8 @@ begin // update cbOptionAutoCheckLatestVersion.Checked := ReadBool('update', 'AutoCheckLatestVersion', True); cbOptionAutoCheckFavStartup.Checked := ReadBool('update', 'AutoCheckFavStartup', True); + cbOptionAutoCheckFavStartupChange(cbOptionAutoCheckFavStartup); + cbOptionAutoOpenFavStartup.Checked := ReadBool('update', 'AutoOpenFavStartup', True); cbOptionAutoCheckFavInterval.Checked := ReadBool('update', 'AutoCheckFavInterval', True); seOptionAutoCheckFavIntervalMinutes.Value := ReadInteger('update', 'AutoCheckFavIntervalMinutes', 60); lbOptionAutoCheckFavIntervalMinutes.Caption := Format(RS_LblAutoCheckNewChapterMinute, [seOptionAutoCheckFavIntervalMinutes.Value]); @@ -4695,6 +4704,7 @@ begin // update WriteBool('update', 'AutoCheckLatestVersion', cbOptionAutoCheckLatestVersion.Checked); WriteBool('update', 'AutoCheckFavStartup', cbOptionAutoCheckFavStartup.Checked); + WriteBool('update', 'AutoOpenFavStartup', cbOptionAutoOpenFavStartup.Checked); WriteBool('update', 'AutoCheckFavInterval', cbOptionAutoCheckFavInterval.Checked); WriteInteger('update', 'AutoCheckFavIntervalMinutes', seOptionAutoCheckFavIntervalMinutes.Value); WriteInteger('update', 'NewMangaTime', seOptionNewMangaTime.Value); @@ -5177,7 +5187,10 @@ begin pcLeft.Width := ReadInteger('form', 'MainSplitter', 195); sbMain.Panels[0].Width := pcLeft.Width + 4; - pcMain.PageIndex := ReadInteger('form', 'pcMainPageIndex', 0); + if cbOptionAutoCheckFavStartup.Checked and cbOptionAutoOpenFavStartup.Checked then + pcMain.ActivePage := tsFavorites + else + pcMain.PageIndex := ReadInteger('form', 'pcMainPageIndex', 0); Left := ReadInteger('form', 'MainFormLeft', MainForm.Left); Top := ReadInteger('form', 'MainFormTop', MainForm.Top); diff --git a/mangadownloader/languages/fmd.en.po b/mangadownloader/languages/fmd.en.po index 2ea0e260..001ee213 100644 --- a/mangadownloader/languages/fmd.en.po +++ b/mangadownloader/languages/fmd.en.po @@ -604,6 +604,10 @@ msgctxt "tmainform.cboptionautochecklatestversion.caption" msgid "Auto check for latest version " msgstr "Auto check for latest version " +#: tmainform.cboptionautoopenfavstartup.caption +msgid "Open Favorites at startup" +msgstr "Open Favorites at startup" + #: tmainform.cboptionchangeunicodecharacter.caption #| msgid "Change all all character to" msgctxt "tmainform.cboptionchangeunicodecharacter.caption" diff --git a/mangadownloader/languages/fmd.id_ID.po b/mangadownloader/languages/fmd.id_ID.po index 9520dbcf..c0c5e4f2 100644 --- a/mangadownloader/languages/fmd.id_ID.po +++ b/mangadownloader/languages/fmd.id_ID.po @@ -593,6 +593,10 @@ msgctxt "tmainform.cboptionautochecklatestversion.caption" msgid "Auto check for latest version " msgstr "Otomatis periksa versi terbaru" +#: tmainform.cboptionautoopenfavstartup.caption +msgid "Open Favorites at startup" +msgstr "Buka Kesukaan saat program dimulai" + #: tmainform.cboptionchangeunicodecharacter.caption msgctxt "tmainform.cboptionchangeunicodecharacter.caption" msgid "Replace all unicode character with" diff --git a/mangadownloader/languages/fmd.pl_PL.po b/mangadownloader/languages/fmd.pl_PL.po index 59bdd837..31908922 100644 --- a/mangadownloader/languages/fmd.pl_PL.po +++ b/mangadownloader/languages/fmd.pl_PL.po @@ -604,6 +604,10 @@ msgctxt "tmainform.cboptionautochecklatestversion.caption" msgid "Auto check for latest version " msgstr "Automatyczne sprawdzanie aktualizacji" +#: tmainform.cboptionautoopenfavstartup.caption +msgid "Open Favorites at startup" +msgstr "" + #: tmainform.cboptionchangeunicodecharacter.caption #| msgid "Change all all character to" msgctxt "tmainform.cboptionchangeunicodecharacter.caption" @@ -2173,3 +2177,4 @@ msgstr "Synchronizacja danych" #: uupdatethread.rs_updatinglist msgid "Updating list" msgstr "Aktualizacja listy" + diff --git a/mangadownloader/languages/fmd.po b/mangadownloader/languages/fmd.po index 8bece7e4..82054847 100644 --- a/mangadownloader/languages/fmd.po +++ b/mangadownloader/languages/fmd.po @@ -558,6 +558,10 @@ msgctxt "TMAINFORM.CBOPTIONAUTOCHECKLATESTVERSION.CAPTION" msgid "Auto check for latest version " msgstr "" +#: tmainform.cboptionautoopenfavstartup.caption +msgid "Open Favorites at startup" +msgstr "" + #: tmainform.cboptionchangeunicodecharacter.caption msgctxt "TMAINFORM.CBOPTIONCHANGEUNICODECHARACTER.CAPTION" msgid "Replace all unicode character with"