Permalink
Browse files

Convert main menu and toolbars from TControlBar to TCoolBar, to be ab…

…le to place an "Update available" link right aligned on the menu.

* Also, convert the donate button to a second label on the menu, so it's less intrusive than before. See http://www.heidisql.com/forum.php?t=13446
* With the "Update available" label visible all the time, we check for updates also for builds, but only show the update check dialog if the user has activated "Check for builds also" option.
  • Loading branch information...
ansgarbecker committed Nov 9, 2013
1 parent 0250410 commit 61202be058cc135f938a131207f47f9546efff26
Showing with 1,550 additions and 657 deletions.
  1. +5 −1 out/locale/en/LC_MESSAGES/default.po
  2. +2 −3 source/about.pas
  3. +4 −8 source/helpers.pas
  4. +355 −540 source/main.dfm
  5. +70 −53 source/main.pas
  6. +1,082 −10 source/updatecheck.dfm
  7. +32 −42 source/updatecheck.pas
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: HeidiSQL\n"
"POT-Creation-Date: 2012-11-05 21:40\n"
"PO-Revision-Date: 2013-10-13 21:22+0100\n"
"PO-Revision-Date: 2013-11-09 07:28+0100\n"
"Last-Translator: Ansgar Becker <heidisql@anse.de>\n"
"Language-Team: English (http://www.transifex.com/projects/p/heidisql/"
"language/en/)\n"
@@ -5678,3 +5678,7 @@ msgstr ""
#. InitConnection, JumpList
msgid "Recent sessions"
msgstr "Recent sessions"
# GetParentFormOrFrame
msgid "Could not determine parent form of this %s"
msgstr "Could not determine parent form of this %s"
@@ -78,8 +78,7 @@ procedure TAboutBox.btnDonatedOKClick(Sender: TObject);
MessageDialog(_('Thanks for donating!'), mtInformation, [mbOK]);
end;
imgDonate.Visible := Check <> nbTrue;
MainForm.imgDonate.Width := 122;
MainForm.imgDonate.Visible := imgDonate.Visible;
MainForm.lblDonate.Visible := imgDonate.Visible;
end;
@@ -110,7 +109,7 @@ procedure TAboutBox.FormShow(Sender: TObject);
lblAppName.Font.Size := 14;
InheritFont(lblAppWebpage.Font);
imgDonate.Visible := MainForm.HasDonated(False) <> nbTrue;
imgDonate.OnClick := MainForm.imgDonate.OnClick;
imgDonate.OnClick := MainForm.lblDonate.OnClick;
editDonated.Text := AppSettings.ReadString(asDonatedEmail);
// Assign text
@@ -132,8 +132,7 @@ TQueryThread = class(TThread)
asLogsqlnum, asLogsqlwidth, asSessionLogsDirectory, asLogHorizontalScrollbar, asSQLColActiveLine,
asMaxColWidth, asDatagridMaximumRows, asDatagridRowsPerStep, asGridRowLineCount, asRememberFilters,
asLogToFile, asMainWinMaximized, asMainWinLeft, asMainWinTop, asMainWinWidth,
asMainWinHeight, asMainWinOnMonitor, asToolBar2Left, asToolBar2Top, asToolBarDataLeft,
asToolBarDataTop, asToolBarQueryLeft, asToolBarQueryTop, asQuerymemoheight, asDbtreewidth,
asMainWinHeight, asMainWinOnMonitor, asCoolBandIndex, asCoolBandBreak, asCoolBandWidth, asQuerymemoheight, asDbtreewidth,
asDataPreviewHeight, asDataPreviewEnabled, asLogHeight, asQueryhelperswidth, asStopOnErrorsInBatchMode,
asWrapLongLines, asDisplayBLOBsAsText, asSingleQueries, asMemoEditorWidth, asMemoEditorHeight,
asMemoEditorWrap, asDelimiter, asSQLHelpWindowLeft, asSQLHelpWindowTop, asSQLHelpWindowWidth,
@@ -3053,12 +3052,9 @@ constructor TAppSettings.Create;
InitSetting(asMainWinWidth, 'MainWinWidth', 800);
InitSetting(asMainWinHeight, 'MainWinHeight', 600);
InitSetting(asMainWinOnMonitor, 'MainWinOnMonitor', 1);
InitSetting(asToolBar2Left, 'ToolBar2Left', 11);
InitSetting(asToolBar2Top, 'ToolBar2Top', 2);
InitSetting(asToolBarDataLeft, 'ToolBarDataLeft', 343);
InitSetting(asToolBarDataTop, 'ToolBarDataTop', 2);
InitSetting(asToolBarQueryLeft, 'ToolBarQueryLeft', 494);
InitSetting(asToolBarQueryTop, 'ToolBarQueryTop', 2);
InitSetting(asCoolBandIndex, 'CoolBand%sIndex', -1);
InitSetting(asCoolBandBreak, 'CoolBand%sBreak', 0, True);
InitSetting(asCoolBandWidth, 'CoolBand%sWidth', 0);
InitSetting(asQuerymemoheight, 'querymemoheight', 100);
InitSetting(asDbtreewidth, 'dbtreewidth', 170);
InitSetting(asDataPreviewHeight, 'DataPreviewHeight', 100);
Oops, something went wrong.

0 comments on commit 61202be

Please sign in to comment.