Fix/enhance various icon issues:

- Fix wrong imageindexes in quickfilter menus for clipboard inserting and "Drop filter"
- Assign existing, fitting icons to all other quick filter menu items and "Insert date/time" items.
- Replace icon for "Query" tab by the big blue arrow which is also used for the "Play" button
- Replace icon for "View Data" buttons and "Data" tab with a more simplistic one from the Silk set. This makes the normal "table" icon more distinct as these both looked very similar previously.
- Edit the "Import CSV file" icon: add some lines which can be better associated with a "text file"
- Remove "Reload privileges" button on toolbar and leave it in the tools "flush" menu. Also remove confusing icon for this menu item as that was highly similar to the master refresh symbol.
- Assign a different (hopefully clearer) icon to "Export SQL" action
- Add seperator between database and table toolbuttons
This commit is contained in:
Ansgar Becker
2008-03-15 10:45:00 +00:00
parent 73b6e59280
commit 01c6552829
8 changed files with 116 additions and 83 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 493 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 572 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 523 B

After

Width:  |  Height:  |  Size: 577 B

BIN
res/icons/text_columns.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 246 B

View File

@ -1055,7 +1055,7 @@ object MDIChild: TMDIChild
end
object tabQuery: TTabSheet
Caption = 'Query'
ImageIndex = 35
ImageIndex = 57
object spltQuery: TSplitter
Left = 0
Top = 125
@ -1683,7 +1683,7 @@ object MDIChild: TMDIChild
Top = 0
Hint = 'Clear Filter'
Caption = 'Clear'
ImageIndex = 58
ImageIndex = 26
OnClick = ClearFilter
end
object sepFilter1: TToolButton
@ -2043,33 +2043,40 @@ object MDIChild: TMDIChild
object QF1: TMenuItem
AutoHotkeys = maManual
Caption = 'Column = Value'
ImageIndex = 61
OnClick = QuickFilterClick
end
object QF2: TMenuItem
AutoHotkeys = maManual
Caption = 'Column != Value'
ImageIndex = 61
OnClick = QuickFilterClick
end
object QF3: TMenuItem
AutoHotkeys = maManual
Caption = 'Column > Value'
ImageIndex = 61
OnClick = QuickFilterClick
end
object QF4: TMenuItem
AutoHotkeys = maManual
Caption = 'Column < Value'
ImageIndex = 61
OnClick = QuickFilterClick
end
object QF5: TMenuItem
Caption = 'Column LIKE Value%'
ImageIndex = 61
OnClick = QuickFilterClick
end
object QF6: TMenuItem
Caption = 'Column LIKE %Value'
ImageIndex = 61
OnClick = QuickFilterClick
end
object QF7: TMenuItem
Caption = 'Column LIKE %Value%'
ImageIndex = 61
OnClick = QuickFilterClick
end
object N11: TMenuItem
@ -2077,22 +2084,27 @@ object MDIChild: TMDIChild
end
object QF8: TMenuItem
Caption = 'Column = ...'
ImageIndex = 58
OnClick = QuickFilterClick
end
object QF9: TMenuItem
Caption = 'Column != ...'
ImageIndex = 58
OnClick = QuickFilterClick
end
object QF10: TMenuItem
Caption = 'Column > ...'
ImageIndex = 58
OnClick = QuickFilterClick
end
object QF11: TMenuItem
Caption = 'Column < ...'
ImageIndex = 58
OnClick = QuickFilterClick
end
object QF12: TMenuItem
Caption = 'Column like ...'
ImageIndex = 58
OnClick = QuickFilterClick
end
object N7: TMenuItem
@ -2101,27 +2113,27 @@ object MDIChild: TMDIChild
end
object QF13: TMenuItem
Caption = 'Column = CLIPBOARD'
ImageIndex = 2
ImageIndex = 4
OnClick = QuickFilterClick
end
object QF14: TMenuItem
Caption = 'Column != CLIPBOARD'
ImageIndex = 2
ImageIndex = 4
OnClick = QuickFilterClick
end
object QF15: TMenuItem
Caption = 'Column > CLIPBOARD'
ImageIndex = 2
ImageIndex = 4
OnClick = QuickFilterClick
end
object QF16: TMenuItem
Caption = 'Column < CLIPBOARD'
ImageIndex = 2
ImageIndex = 4
OnClick = QuickFilterClick
end
object QF17: TMenuItem
Caption = 'Column LIKE %CLIPBOARD%'
ImageIndex = 2
ImageIndex = 4
OnClick = QuickFilterClick
end
object N21: TMenuItem
@ -2129,7 +2141,7 @@ object MDIChild: TMDIChild
end
object DropFilter1: TMenuItem
Caption = 'Drop Filter'
ImageIndex = 70
ImageIndex = 26
OnClick = DropFilter1Click
end
end
@ -2171,29 +2183,35 @@ object MDIChild: TMDIChild
end
object DataInsertDateTime: TMenuItem
Caption = 'Insert Date/Time'
ImageIndex = 80
object DataDateTime: TMenuItem
Caption = 'datetime'
Hint = 'Insert datetime-value'
ImageIndex = 80
OnClick = InsertDate
end
object DataDate: TMenuItem
Caption = 'date'
Hint = 'Insert date-value'
ImageIndex = 80
OnClick = InsertDate
end
object DataTime: TMenuItem
Caption = 'time'
Hint = 'Insert time-value'
ImageIndex = 80
OnClick = InsertDate
end
object DataTimestamp: TMenuItem
Caption = 'timestamp'
Hint = 'Insert timestamp-value'
ImageIndex = 80
OnClick = InsertDate
end
object DataYear: TMenuItem
Caption = 'year'
Hint = 'Insert year-value'
ImageIndex = 80
OnClick = InsertDate
end
end

View File

@ -2473,7 +2473,6 @@ begin
with MainForm do
begin
ButtonRefresh.Enabled := FrmIsFocussed;
ButtonReload.Enabled := FrmIsFocussed;
ExportTables.Enabled := FrmIsFocussed;
ButtonCreateDatabase.Enabled := FrmIsFocussed;
MenuRefresh.Enabled := FrmIsFocussed;

View File

@ -52,7 +52,7 @@ object MainForm: TMainForm
object ToolBarStandard: TToolBar
Left = 11
Top = 2
Width = 421
Width = 406
Height = 22
Align = alNone
AutoSize = True
@ -77,11 +77,11 @@ object MainForm: TMainForm
Action = FileClose1
AutoSize = True
end
object ToolButton3: TToolButton
object tlbSep1: TToolButton
Left = 59
Top = 0
Width = 8
Caption = 'ToolButton3'
Caption = 'tlbSep1'
ImageIndex = 2
Style = tbsSeparator
end
@ -108,11 +108,11 @@ object MainForm: TMainForm
Top = 0
Action = PrintList
end
object ToolButton7: TToolButton
object tlbSep2: TToolButton
Left = 159
Top = 0
Width = 8
Caption = 'ToolButton7'
Caption = 'tlbSep2'
ImageIndex = 3
Style = tbsSeparator
end
@ -136,9 +136,17 @@ object MainForm: TMainForm
ImageIndex = 7
OnClick = ButtonDropDatabaseClick
end
object ButtonCreateTable: TToolButton
object tlbSep3: TToolButton
Left = 213
Top = 0
Width = 8
Caption = 'tlbSep3'
ImageIndex = 32
Style = tbsSeparator
end
object ButtonCreateTable: TToolButton
Left = 221
Top = 0
Hint = 'Create Table'
AutoSize = True
Caption = 'Create Table'
@ -147,21 +155,21 @@ object MainForm: TMainForm
OnClick = ButtonCreateTableClick
end
object ButtonDropTable: TToolButton
Left = 236
Left = 244
Top = 0
Action = DropTable
AutoSize = True
end
object ToolButton4: TToolButton
Left = 259
object tlbSep4: TToolButton
Left = 267
Top = 0
Width = 8
Caption = 'ToolButton4'
Caption = 'tlbSep4'
ImageIndex = 19
Style = tbsSeparator
end
object ButtonRefresh: TToolButton
Left = 267
Left = 275
Top = 0
Hint = 'Refresh'
AutoSize = True
@ -170,33 +178,22 @@ object MainForm: TMainForm
ImageIndex = 0
OnClick = ButtonRefreshClick
end
object ButtonReload: TToolButton
Tag = 2
Left = 290
Top = 0
Hint = 'Reload User-Privileges'
AutoSize = True
Caption = 'Reload'
Enabled = False
ImageIndex = 28
OnClick = FlushClick
end
object ToolButton13: TToolButton
Left = 313
object tlbSep5: TToolButton
Left = 298
Top = 0
Width = 8
Caption = 'ToolButton13'
Caption = 'tlbSep5'
ImageIndex = 19
Style = tbsSeparator
end
object ButtonUserManager: TToolButton
Left = 321
Left = 306
Top = 0
Action = UserManager
AutoSize = True
end
object ButtonImportTextfile: TToolButton
Left = 344
Left = 329
Top = 0
Hint = 'Import CSV file'
AutoSize = True
@ -206,22 +203,22 @@ object MainForm: TMainForm
OnClick = ButtonImportTextfileClick
end
object ButtonExport: TToolButton
Left = 367
Left = 352
Top = 0
Hint = 'Export tables'
Action = ExportTables
AutoSize = True
end
object ToolButton1: TToolButton
Left = 390
object tlbSep6: TToolButton
Left = 375
Top = 0
Width = 8
Caption = 'ToolButton1'
Caption = 'tlbSep6'
ImageIndex = 97
Style = tbsSeparator
end
object btnSQLHelp: TToolButton
Left = 398
Left = 383
Top = 0
Hint = 'SQL Help'
Caption = 'btnSQLHelp'
@ -455,7 +452,6 @@ object MainForm: TMainForm
Caption = 'Privileges'
Enabled = False
Hint = 'Flush Privileges|Flush User-Privileges'
ImageIndex = 28
OnClick = FlushClick
end
object MenuFlushTables: TMenuItem
@ -764,7 +760,7 @@ object MainForm: TMainForm
object ExportTables: TAction
Caption = 'Export tables as SQL'
Enabled = False
ImageIndex = 9
ImageIndex = 20
OnExecute = ExportTablesExecute
end
object LoadSQL: TAction
@ -1956,24 +1952,14 @@ object MainForm: TMainForm
end
item
PngImage.Data = {
89504E470D0A1A0A0000000D49484452000000100000001008060000001FF3FF
610000001974455874536F6674776172650041646F626520496D616765526561
647971C9653C000001DA4944415478DA63FCFFFF3F03258031A06045B68D8369
E7BB6FFFB9C166FDFBC7F01F88FFFEFB0BA4FF33FCFB0FE4FFFD0BA4FF83E9BF
40393EB65F5FAF5F7F5ABEBE3F7C2A63CBEABB7F7979B99948B5F9EEF51BFF26
16D83333562DBB43961F5E3F79CC30ABD48191B172F1EDFF6D312A241B90DCBE
97616EA5332363C5A29BFFDB63D518CE9E3D0BF4FE3F86DFBF7F3318995A321C
3DB40FCCFFF3E70F83A38B07C3CE6D9B184001FE17180EC1C1C10C09ADBB1816
54BB010D5878E37F7B9C3AC92E886BDCCEB0A8DE9391B174FED5FF5D095A0C27
4F9E049BFEEBD72F060B6B7B8643FB77835D00E2BB79FA326C5CB70ACC07E1E8
E8688698BAAD0C4B9ABC19194BE65EF9DF9DA44DB20BA26A36312C6BF163642C
9A7DF17F6F8A1EC3A14387C0A6FFFCF993C1DEC98D61EFAE6D60FE8F1F3F187C
034218562D5F0C0E0F902B5353531922AA3630AC680B6064CC9B76E6FFC44C63
925D1052BA86614D77082363EEE453FF27E59832ECDBB70F6C03C846909F776D
DF0CE67FFFFE9D21382C8A61C1DC9960DB4162F9F9F90CC1C5AB18D6F6863132
664F3CF17F4A9E39C92E082C5AC9B0BE2F9C119417568ACB4A85FD03A5F7BFFF
C0B680FCFE17981EC0A10ECA03A07CF1179A2FC03101366315302F8433529C1B
2935000054A913F0803C94ED0000000049454E44AE426082}
89504E470D0A1A0A0000000D4948445200000010000000100804000000B5FA37
EA0000000467414D410000AFC837058AE90000001974455874536F6674776172
650041646F626520496D616765526561647971C9653C000000814944415478DA
63FCCF801F30524741F9FF7F0C7FC0703A230343D4FF5F0CBF197E01E15E4662
4D28F8FF07A807041703F5F8FCFFC5008167883621F5FF6FB0ADBF193600F5D8
C14DB845B40991703DFB817AF4A1BEF8CDF09C6813BCE1269C05EA51FCFF1BEA
A7CF449B60FBFF2758FF6F86DB403DA2401320E1FA876813F00100085D5801C5
46697F0000000049454E44AE426082}
Name = 'PngImage41'
Background = clWindow
end
@ -2203,22 +2189,24 @@ object MainForm: TMainForm
item
PngImage.Data = {
89504E470D0A1A0A0000000D49484452000000100000001008060000001FF3FF
610000001974455874536F6674776172650041646F626520496D616765526561
647971C9653C000001C24944415478DA9593414B5B4110C7FFEF25040D484802
F150DB8BA6F4D283D8C673FC16DEC4F410340111FA19BC55C8A5878082A4A792
9A78103C485B2F6AB52687404D0E6D8842C15CA526BBFB5E9C7966E5BD12D274
6198D9F7E6FF637676C7E8F57A300C630AC024990FC3D70D598B34B6FE60F401
739D4EE7D0E7F34D506C0E522AA590CFE773D96C76D30DD1808494F2B8DBED9A
147B44B66D43088168348A76BB8D62B198CB64328F10CE667B4DC9A70481699A
8E48032CCB72009148C4F1FCAF5028E4D2E9F426019A1E0027EBC5895C1D43A8
3284C361CF91FC7EFF3CB9330FA07F1C27816306B23184AB6328C7B1586C30E0
EFC6B921DA18120A854603B8212C64CFFB6030383AC0DD0FDDA34020F07F0016
AF7D79032914DD8484EC487C58DC1D0E60913B5E395842727A01CA52287FDBC3
A7D4FE6800ED53A545245F2C4058124795239C97ABA946F9E7F63F6FE1DDC906
7EFCAE21321EC5CC93E70410F875DDC479E54C7485FCEC069CF463EF0CD80AEB
A5557EF4883F8B4328818B5A15F5CB468B9A1AD7B3F08A5EDB571AA631D20C1C
A6F4CE32EE7A7F9C26E2D6B03FBE2D2548FB5D039EE2619C078AF59A5D7FB925
EF84AABDAFA7687B43DAAB7B9ABA5972B8F463410000000049454E44AE426082}
610000001874455874536F667477617265005061696E742E4E45542076332E31
3072B22592000001EB4944415478DA9593CF6B135110C7BFBB0921064C4802F1
E08F4B4DF12241B4951CDB90E46FE84D4C0F411390827F83370BB9780828480A
09923631207810B5171B5B6D0F016D0F5A6AA1D05CC526EFBDDD38B3E495ACA4
51078637ECCEF733336F778CC16000C3302E01B840EEC1643B263F208DAD1F18
43C0CD5EAFF7C6E3F19CA7D81CA7544AA15C2E978AC5E2F228440366A5941FFA
FDBE49B14B64DB3684108846A3E876BBA8D7EBA542A1700AE16CF6194A6E1304
A6693A220DB02CCB01442211E7E477954AA594CFE79709B0EF027072ABD582DF
EF472A95E26A0806834826930887C3AE91BC5EEF6D3A365D80E1384E02C70C64
E74EB83BAECE712C161B0FF8F3E24621DA19120A85CE0654AB55A7DD6C367B1A
F338ED761B8944C2B9A34020F06F1D68E3AABA1B369FCFF77F00163F78B70829
147D0909D9935859589B3C42269341AD5673E2743A8D7BAFEF606E6A1ECA5268
7E7C89D5DCABC91D70D5D133D758C0DCB579084B627D7B1D5BCD9DDC5EF3DBB3
BF7E85C71B8FF0E5A883C8B928AE5E9C2680C0F7C37D6C6D6F8ABE906F47011B
C3D8BD03B6C252E33EFFF4885F89432881CF9D1DEC7EDD3BA04B8DEB5DB8457B
F09E96C94F9AB1CB947F7E1727835FCE25E2A761BF78D89825ED270DB83C5CE7
B1626D3796AE3F952742759EECE678B549FBE337F4FC4D72BE47841E00000000
49454E44AE426082}
Name = 'PngImage50'
Background = clWindow
end
@ -3331,6 +3319,34 @@ object MainForm: TMainForm
44AE426082}
Name = 'PngImage78'
Background = clWindow
end
item
PngImage.Data = {
89504E470D0A1A0A0000000D49484452000000100000001008060000001FF3FF
610000001974455874536F6674776172650041646F626520496D616765526561
647971C9653C0000027F4944415478DAA5937F48535114C7BF0F294229CB36C5
F08F22B4C0CA247FA0AE648CD60FFAB1440B04E9071A29943475E00C830A2358
84201698C6DC4873520D244B5A6B250589F4C79C33B52152663F5D85D0F6DE7D
B7FBDE9B492041781F87EF39E7F13EE79E77CFE528A558CCE22480ED59B09E49
19A16292288A202220484A249F42603A6F0444A02C2F0E34942467C900AB67E6
7361F672D5FF543EDF391EB21CDBB84C06B4B9BFD22339B188E92E07A4968800
8804E079C50F87981F0642BC9C9BAD75C36C7B83C6B2544E06B4B8BED0E2BC95
0C700A4854B38F05C5A8108148006602830C7FC06C9D0735B786D15CBE4501DC
E8FB444B76C4CDEF808A8AB2FF20EF84CC2991DFCD9676A1B2C58B9BA7D31540
53EF343DAE55C139F00DC5DBE3FFD9BBE3C514B49BE250D53A04EBD90C0570AD
678A96EAD4E87D3D83C3B9F1B8E775A03FE041594E05FC1F7D708DF64197A2C7
A1CD45B07BDE236FC30A98DB87D161CA560016E73B7A529F80C7DE200AB2D472
A572C70954E657E379E0298E6696A2B6C788AB079BD0EA9A84262516E76C3E38
CCB90AE0F2DD495AB12B111E7F100732FE063CF23F90558AAF17B5A1F9E10474
A9AB5067F3A2DBAC510017BA26E899BD6BF072EC3BF6A4ABE5AAB707DBA1599F
8FE825D1708FB9A04DD6C92D34F604B03B6D351ABA4660AD8AB450DF19A0C67D
4978F5F607F4692AC8E3CD4546953D52CC714AC2727F1CFBB7A971B1C307BB29
D282D93E4A6B0C6B31C800D34141393596E7A5596247176689300BC2BC88A551
0486CC0434DCF1C15A1D01D45847686DC1BAC8DCCFCD3EFD7317165A973A8644
9B292F4A0618DBFCFD024FB6B24A31BC4020191144565D02F10B02823F7F399F
5CD969E0167B9D7F03EBEF86F007A58FFC0000000049454E44AE426082}
Name = 'PngImage80'
Background = clWindow
end>
PngOptions = [pngBlendOnDisabled, pngGrayscaleOnDisabled]
Left = 8

View File

@ -81,19 +81,18 @@ type
ToolBarStandard: TToolBar;
ToolButton9: TToolButton;
FileCloseItem2: TToolButton;
ToolButton3: TToolButton;
tlbSep1: TToolButton;
ToolButton5: TToolButton;
ToolButton6: TToolButton;
ToolButton12: TToolButton;
ToolButton7: TToolButton;
tlbSep2: TToolButton;
ButtonCreateDatabase: TToolButton;
ButtonCreateTable: TToolButton;
ButtonDropDatabase: TToolButton;
ButtonDropTable: TToolButton;
ToolButton4: TToolButton;
tlbSep4: TToolButton;
ButtonRefresh: TToolButton;
ButtonReload: TToolButton;
ToolButton13: TToolButton;
tlbSep5: TToolButton;
ButtonImportTextfile: TToolButton;
ButtonExport: TToolButton;
ButtonUserManager: TToolButton;
@ -139,9 +138,10 @@ type
menuSQLHelp: TMenuItem;
N8: TMenuItem;
Import1: TMenuItem;
ToolButton1: TToolButton;
tlbSep6: TToolButton;
menuUpdateCheck: TMenuItem;
PngImageListMain: TPngImageList;
tlbSep3: TToolButton;
procedure btnSQLHelpClick(Sender: TObject);
procedure menuWindowClick(Sender: TObject);
procedure focusWindow(Sender: TObject);