[DEVELOPMENT ENVIRONMENT]

* NEW: Apply color theme to project treeview, property sheet and form 
  hierarchy window.

[INTERPRETER]
* NEW: gbr3 and gbx3 now interpret their command line the same way.
* NEW: The -L option now prints the license, and the -h option only print
  the interpreter usage.

[GB.GTK]
* BUG: As the Y-axis is top-down, positive angles must be clockwise in theme
  Paint class implementation.

[GB.QT4]
* BUG: As the Y-axis is top-down, positive angles must be clockwise in theme
  Paint class implementation.


git-svn-id: svn://localhost/gambas/trunk@2653 867c0c6c-44f3-4631-809d-bfa615b0a4ec
This commit is contained in:
Benoît Minisini 2010-02-01 12:17:38 +00:00
parent fd13cc710e
commit 34ece710f0
15 changed files with 396 additions and 357 deletions
app/src/gambas3
examples/examples
Automation/DBusExplorer
Drawing/Painting
gb.gtk/src
gb.qt4/src
main/gbx

View file

@ -356,7 +356,7 @@ msgstr ""
#: Design.module:384 FColorChooser.class:197 FCommit.class:391
#: FConnectionEditor.class:411 FCreateFile.class:879 FFontChooser.class:80
#: FGotoLine.class:57 FList.class:333 FMain.class:2780
#: FGotoLine.class:57 FList.class:333 FMain.class:2782
#: FMakeExecutable.class:138 FMenu.class:1123 FNewConnection.class:586
#: FNewTable.class:162 FNewTranslation.class:64 FOpenProject.class:433
#: FPasteSpecial.class:273 FPropertyProject.class:252
@ -420,13 +420,13 @@ msgstr ""
msgid "System information"
msgstr ""
#: FAbout.class:597 FList.class:310 FMain.class:2299
#: FAbout.class:597 FList.class:310 FMain.class:2301
msgid "&Copy"
msgstr ""
#: FAbout.class:605 FConflict.class:25 FFindList.class:203
#: FIconEditor.class:1412 FImportTable.class:656 FInfo.class:427
#: FMakeInstall.class:260 FOption.class:1211 FTips.class:232
#: FMakeInstall.class:260 FOption.class:1214 FTips.class:232
msgid "Close"
msgstr ""
@ -462,7 +462,7 @@ msgstr ""
#: FList.class:155 FMain.class:204 FMakeExecutable.class:144
#: FMakeInstall.class:309 FMenu.class:1128 FNewConnection.class:317
#: FNewTable.class:168 FNewTranslation.class:70 FOpenProject.class:146
#: FOption.class:576 FPasteSpecial.class:279 FPropertyProject.class:1236
#: FOption.class:579 FPasteSpecial.class:279 FPropertyProject.class:1236
#: FSave.class:118 FSelectExtraFile.class:78 FSelectIcon.class:271
#: FTableChooser.class:145 FText.class:107 FTextEditor.class:462
#: FTranslate.class:606 Project.module:350
@ -518,7 +518,7 @@ msgstr ""
#: FCommit.class:255 FConflict.class:348 FConnectionEditor.class:1848
#: FEditor.class:3199 FForm.class:3628 FIconEditor.class:2150
#: FOption.class:1190 FOutput.class:455 FTextEditor.class:642
#: FOption.class:1193 FOutput.class:455 FTextEditor.class:642
msgid "Undo"
msgstr ""
@ -571,7 +571,7 @@ msgid ""
"You must resolve the conflict in order to use the file."
msgstr ""
#: FConflict.class:25 FMain.class:2270
#: FConflict.class:25 FMain.class:2272
msgid "&Edit"
msgstr ""
@ -834,7 +834,7 @@ msgstr ""
msgid "Fields"
msgstr ""
#: FConnectionEditor.class:1687 FMain.class:1612
#: FConnectionEditor.class:1687 FMain.class:1614
msgid "Add"
msgstr ""
@ -898,7 +898,7 @@ msgstr ""
msgid "New file"
msgstr ""
#: FCreateFile.class:562 FMain.class:2178
#: FCreateFile.class:562 FMain.class:2180
msgid "New"
msgstr ""
@ -920,7 +920,7 @@ msgid "Style sheet"
msgstr ""
#: FCreateFile.class:744 FCreateProject.class:537 FImportTable.class:489
#: FOption.class:1017 FPropertyProject.class:1653
#: FOption.class:1020 FPropertyProject.class:1653
msgid "Options"
msgstr ""
@ -988,7 +988,7 @@ msgstr ""
msgid "The project has been successfully created."
msgstr ""
#: FCreateProject.class:336 FMain.class:2428
#: FCreateProject.class:336 FMain.class:2430
msgid "New project"
msgstr ""
@ -1124,7 +1124,7 @@ msgid "Function"
msgstr ""
#: FDebugInfo.class:51 FFindList.class:73 FIconEditor.class:2278
#: FOption.class:1035
#: FOption.class:1038
msgid "Line"
msgstr ""
@ -1137,7 +1137,7 @@ msgid "Do you want to clear the expression list ?"
msgstr ""
#: FDebugInfo.class:490 FIconEditor.class:1393 FList.class:155
#: FOption.class:576 FOutput.class:494
#: FOption.class:579 FOutput.class:494
msgid "Clear"
msgstr ""
@ -1149,11 +1149,11 @@ msgstr ""
msgid "Dynamic variables"
msgstr ""
#: FDebugInfo.class:968 FMain.class:2715
#: FDebugInfo.class:968 FMain.class:2717
msgid "Debug"
msgstr ""
#: FDebugInfo.class:981 FMain.class:2559
#: FDebugInfo.class:981 FMain.class:2561
msgid "Console"
msgstr ""
@ -1193,7 +1193,7 @@ msgstr ""
msgid "Remove current expression"
msgstr ""
#: FDebugInfo.class:1081 FMain.class:2382 FMakeInstall.class:1564
#: FDebugInfo.class:1081 FMain.class:2384 FMakeInstall.class:1564
#: FPropertyProject.class:1954
msgid "&Remove"
msgstr ""
@ -1253,7 +1253,7 @@ msgstr ""
msgid "Open form"
msgstr ""
#: FEditor.class:3165 FForm.class:3314 FMain.class:2341
#: FEditor.class:3165 FForm.class:3314 FMain.class:2343
msgid "&Startup class"
msgstr ""
@ -1329,7 +1329,7 @@ msgstr ""
msgid "Paste as comments"
msgstr ""
#: FEditor.class:3368 FOption.class:998
#: FEditor.class:3368 FOption.class:1001
msgid "Editor"
msgstr ""
@ -1596,27 +1596,27 @@ msgstr ""
msgid "Move tab last"
msgstr ""
#: FFormStack.class:293 FMain.class:2743
#: FFormStack.class:294 FMain.class:2745
msgid "Hierarchy"
msgstr ""
#: FFormStack.class:301
#: FFormStack.class:302
msgid "Click on a form to display the hierarchy of its controls..."
msgstr ""
#: FFormStack.class:310
#: FFormStack.class:311
msgid "Move top"
msgstr ""
#: FFormStack.class:317
#: FFormStack.class:318
msgid "Move up"
msgstr ""
#: FFormStack.class:324
#: FFormStack.class:325
msgid "Move down"
msgstr ""
#: FFormStack.class:331
#: FFormStack.class:332
msgid "Move bottom"
msgstr ""
@ -1946,7 +1946,7 @@ msgstr ""
msgid "This file has not been modified since the last commit."
msgstr ""
#: FInfo.class:309 FOption.class:722 FPropertyProject.class:1570
#: FInfo.class:309 FOption.class:725 FPropertyProject.class:1570
msgid "General"
msgstr ""
@ -1998,7 +1998,7 @@ msgstr ""
msgid "Cl&ear"
msgstr ""
#: FList.class:316 FMain.class:2306
#: FList.class:316 FMain.class:2308
msgid "&Paste"
msgstr ""
@ -2037,416 +2037,416 @@ msgid ""
"Please install them to be able to do the translation."
msgstr ""
#: FMain.class:1169
#: FMain.class:1171
msgid "Do you really want to update all forms?"
msgstr ""
#: FMain.class:1169
#: FMain.class:1171
msgid "Update"
msgstr ""
#: FMain.class:1346
#: FMain.class:1348
msgid ""
"All backup or generated files will be removed from the project directory."
msgstr ""
#: FMain.class:1346
#: FMain.class:1348
msgid "Clean"
msgstr ""
#: FMain.class:1612
#: FMain.class:1614
msgid "Do you really want to add this file to the repository?"
msgstr ""
#: FMain.class:1789
#: FMain.class:1791
msgid "&File"
msgstr ""
#: FMain.class:1793
#: FMain.class:1795
msgid "&New project..."
msgstr ""
#: FMain.class:1800
#: FMain.class:1802
msgid "&Open project..."
msgstr ""
#: FMain.class:1806
#: FMain.class:1808
msgid "Open &recent"
msgstr ""
#: FMain.class:1814
#: FMain.class:1816
msgid "Open &example"
msgstr ""
#: FMain.class:1827
#: FMain.class:1829
msgid "&Save project"
msgstr ""
#: FMain.class:1834
#: FMain.class:1836
msgid "Save project &as..."
msgstr ""
#: FMain.class:1845
#: FMain.class:1847
msgid "&Quit"
msgstr ""
#: FMain.class:1852
#: FMain.class:1854
msgid "&Project"
msgstr ""
#: FMain.class:1856
#: FMain.class:1858
msgid "&Compile"
msgstr ""
#: FMain.class:1863
#: FMain.class:1865
msgid "Compile &All"
msgstr ""
#: FMain.class:1874
#: FMain.class:1876
msgid "&Translate..."
msgstr ""
#: FMain.class:1884
#: FMain.class:1886
msgid "Make"
msgstr ""
#: FMain.class:1888
#: FMain.class:1890
msgid "E&xecutable..."
msgstr ""
#: FMain.class:1895
#: FMain.class:1897
msgid "&Source archive..."
msgstr ""
#: FMain.class:1902
#: FMain.class:1904
msgid "&Installation package..."
msgstr ""
#: FMain.class:1914
#: FMain.class:1916
msgid "&Clean up"
msgstr ""
#: FMain.class:1920
#: FMain.class:1922
msgid "&Refresh"
msgstr ""
#: FMain.class:1926
#: FMain.class:1928
msgid "Put on &version control"
msgstr ""
#: FMain.class:1937
#: FMain.class:1939
msgid "&Properties..."
msgstr ""
#: FMain.class:1944
#: FMain.class:1946
msgid "&Debug"
msgstr ""
#: FMain.class:1948
#: FMain.class:1950
msgid "&Run"
msgstr ""
#: FMain.class:1959
#: FMain.class:1961
msgid "&Pause"
msgstr ""
#: FMain.class:1966
#: FMain.class:1968
msgid "&Stop"
msgstr ""
#: FMain.class:1973
#: FMain.class:1975
msgid "St&ep"
msgstr ""
#: FMain.class:1980
#: FMain.class:1982
msgid "&Forward"
msgstr ""
#: FMain.class:1987
#: FMain.class:1989
msgid "Finis&h"
msgstr ""
#: FMain.class:1994
#: FMain.class:1996
msgid "Run &until"
msgstr ""
#: FMain.class:2005
#: FMain.class:2007
msgid "&Toggle breakpoint"
msgstr ""
#: FMain.class:2013
#: FMain.class:2015
msgid "Clear &all breakpoints"
msgstr ""
#: FMain.class:2022
#: FMain.class:2024
msgid "&Watch expression"
msgstr ""
#: FMain.class:2028
#: FMain.class:2030
msgid "Close all &debug windows"
msgstr ""
#: FMain.class:2033
#: FMain.class:2035
msgid "&View"
msgstr ""
#: FMain.class:2037
#: FMain.class:2039
msgid "Pro&ject"
msgstr ""
#: FMain.class:2046
#: FMain.class:2048
msgid "&Properties"
msgstr ""
#: FMain.class:2054
#: FMain.class:2056
msgid "&Toolbox"
msgstr ""
#: FMain.class:2062
#: FMain.class:2064
msgid "&Console"
msgstr ""
#: FMain.class:2073
#: FMain.class:2075
msgid "Status bar"
msgstr ""
#: FMain.class:2080
#: FMain.class:2082
msgid "Hide menubar"
msgstr ""
#: FMain.class:2087
#: FMain.class:2089
msgid "Close &all windows"
msgstr ""
#: FMain.class:2093
#: FMain.class:2095
msgid "&Tools"
msgstr ""
#: FMain.class:2097
#: FMain.class:2099
msgid "&Find && replace"
msgstr ""
#: FMain.class:2108
#: FMain.class:2110
msgid "&Browse project..."
msgstr ""
#: FMain.class:2115
#: FMain.class:2117
msgid "&Open a terminal..."
msgstr ""
#: FMain.class:2122
#: FMain.class:2124
msgid "&Update all forms"
msgstr ""
#: FMain.class:2132
#: FMain.class:2134
msgid "&Shortcuts..."
msgstr ""
#: FMain.class:2138
#: FMain.class:2140
msgid "&Preferences..."
msgstr ""
#: FMain.class:2146
#: FMain.class:2148
msgid "&?"
msgstr ""
#: FMain.class:2150
#: FMain.class:2152
msgid "&Help browser"
msgstr ""
#: FMain.class:2158
#: FMain.class:2160
msgid "&Tips of the day"
msgstr ""
#: FMain.class:2168
#: FMain.class:2170
msgid "&About Gambas..."
msgstr ""
#: FMain.class:2182
#: FMain.class:2184
msgid "&Directory"
msgstr ""
#: FMain.class:2193
#: FMain.class:2195
msgid "&Module..."
msgstr ""
#: FMain.class:2201
#: FMain.class:2203
msgid "&Class..."
msgstr ""
#: FMain.class:2209
#: FMain.class:2211
msgid "&Form..."
msgstr ""
#: FMain.class:2217
#: FMain.class:2219
msgid "&WebPage..."
msgstr ""
#: FMain.class:2225
#: FMain.class:2227
msgid "&Report..."
msgstr ""
#: FMain.class:2237
#: FMain.class:2239
msgid "&Image..."
msgstr ""
#: FMain.class:2244
#: FMain.class:2246
msgid "&HTML file..."
msgstr ""
#: FMain.class:2251
#: FMain.class:2253
msgid "&Style sheet..."
msgstr ""
#: FMain.class:2259
#: FMain.class:2261
msgid "&Other..."
msgstr ""
#: FMain.class:2275
#: FMain.class:2277
msgid "Edit &code"
msgstr ""
#: FMain.class:2279
#: FMain.class:2281
msgid "Edit with"
msgstr ""
#: FMain.class:2292
#: FMain.class:2294
msgid "&Cut"
msgstr ""
#: FMain.class:2313
#: FMain.class:2315
msgid "&Rename..."
msgstr ""
#: FMain.class:2320
#: FMain.class:2322
msgid "&Delete..."
msgstr ""
#: FMain.class:2331
#: FMain.class:2333
msgid "Copy file pat&h"
msgstr ""
#: FMain.class:2350
#: FMain.class:2352
msgid "&Add to repository"
msgstr ""
#: FMain.class:2367
#: FMain.class:2369
msgid "&New connection..."
msgstr ""
#: FMain.class:2376
#: FMain.class:2378
msgid "&Open"
msgstr ""
#: FMain.class:2419
#: FMain.class:2421
msgid "Toolbox"
msgstr ""
#: FMain.class:2436
#: FMain.class:2438
msgid "Open project"
msgstr ""
#: FMain.class:2444
#: FMain.class:2446
msgid "Save project"
msgstr ""
#: FMain.class:2452 Project.module:1958
#: FMain.class:2454 Project.module:1958
msgid "Save project as"
msgstr ""
#: FMain.class:2460 FPropertyProject.class:52
#: FMain.class:2462 FPropertyProject.class:52
msgid "Project properties"
msgstr ""
#: FMain.class:2469
#: FMain.class:2471
msgid "Refresh project"
msgstr ""
#: FMain.class:2477 FOption.class:679
#: FMain.class:2479 FOption.class:682
msgid "Preferences"
msgstr ""
#: FMain.class:2487
#: FMain.class:2489
msgid "Shortcuts"
msgstr ""
#: FMain.class:2499
#: FMain.class:2501
msgid "Translate"
msgstr ""
#: FMain.class:2508
#: FMain.class:2510
msgid "Make source archive"
msgstr ""
#: FMain.class:2516 FMakeExecutable.class:82
#: FMain.class:2518 FMakeExecutable.class:82
msgid "Make executable"
msgstr ""
#: FMain.class:2525 FMakeInstall.class:1168
#: FMain.class:2527 FMakeInstall.class:1168
msgid "Make installation package"
msgstr ""
#: FMain.class:2538 FSelectIcon.class:214 Project.module:1263
#: FMain.class:2540 FSelectIcon.class:214 Project.module:1263
msgid "Project"
msgstr ""
#: FMain.class:2549
#: FMain.class:2551
msgid "Properties sheet"
msgstr ""
#: FMain.class:2568
#: FMain.class:2570
msgid "Find & replace"
msgstr ""
#: FMain.class:2581
#: FMain.class:2583
msgid "Compile"
msgstr ""
#: FMain.class:2589
#: FMain.class:2591
msgid "Compile all"
msgstr ""
#: FMain.class:2597
#: FMain.class:2599
msgid "Run"
msgstr ""
#: FMain.class:2605
#: FMain.class:2607
msgid "Pause"
msgstr ""
#: FMain.class:2613
#: FMain.class:2615
msgid "Stop"
msgstr ""
#: FMain.class:2621
#: FMain.class:2623
msgid "Step"
msgstr ""
#: FMain.class:2629
#: FMain.class:2631
msgid "Forward"
msgstr ""
#: FMain.class:2637
#: FMain.class:2639
msgid "Finish current function"
msgstr ""
#: FMain.class:2646
#: FMain.class:2648
msgid "Run until current line"
msgstr ""
#: FMain.class:2655
#: FMain.class:2657
msgid "Watch expression"
msgstr ""
#: FMain.class:2663
#: FMain.class:2665
msgid "Toggle breakpoint"
msgstr ""
#: FMain.class:2672
#: FMain.class:2674
msgid "Show menu bar"
msgstr ""
#: FMain.class:2724 FProperty.class:1128
#: FMain.class:2726 FProperty.class:1136
msgid "Properties"
msgstr ""
@ -2960,179 +2960,179 @@ msgstr ""
msgid "Export a theme file"
msgstr ""
#: FOption.class:276
#: FOption.class:279
msgid "Select a theme file"
msgstr ""
#: FOption.class:306
#: FOption.class:309
msgid "You need to restart the application to see your changes."
msgstr ""
#: FOption.class:576
#: FOption.class:579
msgid "Do you really want to clear the documentation cache?"
msgstr ""
#: FOption.class:691
#: FOption.class:694
msgid "Foreground color..."
msgstr ""
#: FOption.class:695
#: FOption.class:698
msgid "Background color..."
msgstr ""
#: FOption.class:703
#: FOption.class:706
msgid "Bold"
msgstr ""
#: FOption.class:707
#: FOption.class:710
msgid "Italic"
msgstr ""
#: FOption.class:711
#: FOption.class:714
msgid "Underline"
msgstr ""
#: FOption.class:727
#: FOption.class:730
msgid "Interface"
msgstr ""
#: FOption.class:737
#: FOption.class:740
msgid "Font size"
msgstr ""
#: FOption.class:745
#: FOption.class:748
msgid "Normal"
msgstr ""
#: FOption.class:745
#: FOption.class:748
msgid "Small"
msgstr ""
#: FOption.class:756
#: FOption.class:759
msgid "Tabstrip font size"
msgstr ""
#: FOption.class:764
#: FOption.class:767
msgid "Tiny"
msgstr ""
#: FOption.class:775
#: FOption.class:778
msgid "Toolbox size"
msgstr ""
#: FOption.class:794
#: FOption.class:797
msgid "Sort properties"
msgstr ""
#: FOption.class:801 FPropertyProject.class:1707
#: FOption.class:804 FPropertyProject.class:1707
msgid "No"
msgstr ""
#: FOption.class:801 FPropertyProject.class:1707
#: FOption.class:804 FPropertyProject.class:1707
msgid "Yes"
msgstr ""
#: FOption.class:812
#: FOption.class:815
msgid "Quiet external commands"
msgstr ""
#: FOption.class:830
#: FOption.class:833
msgid "Minimize at runtime"
msgstr ""
#: FOption.class:848
#: FOption.class:851
msgid "Icon theme"
msgstr ""
#: FOption.class:863
#: FOption.class:866
msgid "Applications"
msgstr ""
#: FOption.class:873
#: FOption.class:876
msgid "Browser"
msgstr ""
#: FOption.class:892
#: FOption.class:895
msgid "Terminal"
msgstr ""
#: FOption.class:911
#: FOption.class:914
msgid "Image editor"
msgstr ""
#: FOption.class:923 MTheme.module:6
#: FOption.class:926 MTheme.module:6
msgid "Help"
msgstr ""
#: FOption.class:938
#: FOption.class:941
msgid "Display property help"
msgstr ""
#: FOption.class:956
#: FOption.class:959
msgid "Show tooltips"
msgstr ""
#: FOption.class:974
#: FOption.class:977
msgid "Show documentation in popups"
msgstr ""
#: FOption.class:993
#: FOption.class:996
msgid "Clear documentation cache"
msgstr ""
#: FOption.class:1003
#: FOption.class:1006
msgid "Font"
msgstr ""
#: FOption.class:1027
#: FOption.class:1030
msgid "Procedure separation"
msgstr ""
#: FOption.class:1035 FProperty.class:739
#: FOption.class:1038 FProperty.class:741
msgid "None"
msgstr ""
#: FOption.class:1035
#: FOption.class:1038
msgid "Blend"
msgstr ""
#: FOption.class:1046
#: FOption.class:1049
msgid "Highlight current line"
msgstr ""
#: FOption.class:1064
#: FOption.class:1067
msgid "Highlight modified lines"
msgstr ""
#: FOption.class:1082
#: FOption.class:1085
msgid "Show line numbers"
msgstr ""
#: FOption.class:1100
#: FOption.class:1103
msgid "Fold procedures by default"
msgstr ""
#: FOption.class:1118
#: FOption.class:1121
msgid "Default tab size"
msgstr ""
#: FOption.class:1131
#: FOption.class:1134
msgid "spaces"
msgstr ""
#: FOption.class:1142
#: FOption.class:1145
msgid "Keywords in upper case"
msgstr ""
#: FOption.class:1153
#: FOption.class:1156
msgid "Theme"
msgstr ""
#: FOption.class:1176
#: FOption.class:1179
msgid "Import theme"
msgstr ""
#: FOption.class:1183
#: FOption.class:1186
msgid "Export theme"
msgstr ""
@ -3184,57 +3184,61 @@ msgstr ""
msgid "Clipboard contents"
msgstr ""
#: FProperty.class:349
#: FProperty.class:351
msgid "Forbidden characters in control name."
msgstr ""
#: FProperty.class:354
#: FProperty.class:356
msgid "This name is already in use."
msgstr ""
#: FProperty.class:364
#: FProperty.class:366
msgid "Forbidden characters in control group."
msgstr ""
#: FProperty.class:422
#: FProperty.class:424
msgid "Incorrect property value."
msgstr ""
#: FProperty.class:571
#: FProperty.class:573
msgid "The name of the control."
msgstr ""
#: FProperty.class:582
#: FProperty.class:584
msgid "The event group that the control belongs to."
msgstr ""
#: FProperty.class:596
#: FProperty.class:598
msgid ""
"If the form and controls dimensions must follow the size of the default font."
msgstr ""
#: FProperty.class:600
#: FProperty.class:602
msgid "If the control is public."
msgstr ""
#: FProperty.class:620
#: FProperty.class:622
msgid ""
"This property is virtual: it is only implemented in the IDE, and has no "
"existence at runtime."
msgstr ""
#: FProperty.class:912
#: FProperty.class:914
msgid "Edit field list"
msgstr ""
#: FProperty.class:1138
#: FProperty.class:1146
msgid "Click on a form or a control to modify its properties..."
msgstr ""
#: FProperty.class:1154
#: FProperty.class:1162
msgid "Lock property"
msgstr ""
#: FProperty.class:1217
msgid "..."
msgstr ""
#: FPropertyProject.class:108
msgid "Not translatable"
msgstr ""

View file

@ -263,6 +263,7 @@ End
Public Sub ReadConfig()
tvwControl.Font.Grade = - Settings["/GlobalFont", 0]
MTheme.InitControl(tvwControl)
RefreshAll
End

View file

@ -22,6 +22,8 @@ Private $bSort As Boolean
Private $bDisableIntegratedHelp As Boolean
Private $hWebView As WebView
Private $iHighlightColor As Integer
Public Sub _new()
Settings.Read(Me)
@ -200,12 +202,12 @@ Public Sub RefreshAll()
grdProperty[iRow, 1].Alignment = Align.TopNormal
If CControl.WasDefaultValue Then
grdProperty[iRow, 0].Background = Color.TextBackground
grdProperty[iRow, 1].Background = Color.TextBackground
grdProperty[iRow, 0].Background = grdProperty.Background 'Color.Default 'Color.TextBackground
grdProperty[iRow, 1].Background = grdProperty.Background 'Color.Default 'Color.TextBackground
grdProperty[iRow, 0].Font.Bold = False
Else
grdProperty[iRow, 0].Background = Color.LightBackground
grdProperty[iRow, 1].Background = Color.LightBackground
grdProperty[iRow, 0].Background = $iHighlightColor 'Color.LightBackground
grdProperty[iRow, 1].Background = $iHighlightColor 'Color.LightBackground
grdProperty[iRow, 0].Font.Bold = True
Endif
@ -1001,6 +1003,12 @@ Public Sub ReadConfig()
cmbProperty.Font = grdProperty.Font
spnProperty.Font = grdProperty.Font
panProperty.Font = grdProperty.Font
MTheme.InitControl(grdProperty)
MTheme.InitControl(cmbProperty)
MTheme.InitControl(spnProperty)
MTheme.InitControl(txtProperty)
MTheme.InitControl(btnProperty)
$iHighlightColor = MTheme.GetColor("Selection")
MoveProperty
RefreshAll

View file

@ -69,10 +69,10 @@
{ btnProperty Button
MoveScaled(16,14,3,3)
Visible = False
Font = Font["Bold,-2"]
Background = Color.TextBackground
Ignore = True
Text = ("")
Picture = Picture["img/16/points.png"]
Text = ("...")
}
}
{ spnHelp SidePanel

View file

@ -905,6 +905,8 @@ Public Sub ReadConfig()
panMessage.Visible = bShow
mnuStatusBar.Value = bShow
MTheme.InitControl(tvwProject)
'panTabProperty.H = tabProperty.ClientY - 2
End

View file

@ -171,6 +171,9 @@ Private Sub RefreshEditor()
FOutput.ReadConfig
FFindList.ReadConfig
FMain.ReadConfig
FProperty.ReadConfig
FFormStack.ReadConfig
End

View file

@ -113,3 +113,20 @@ Public Sub InitEditor(hEditor As Editor)
Next
End
Public Sub GetColor(sStyle As String) As Integer
Dim hStyle As New CStyle
hStyle.FromString(Settings["Highlight" &/ sStyle, $cDefault[sStyle]])
Return hStyle.Foreground
End
Public Sub InitControl(hControl As Control)
hControl.Background = GetColor("Background")
hControl.Foreground = GetColor("Normal")
End

View file

@ -100,10 +100,12 @@ SearchComment=False
SearchString=True
[OpenFile]
Active=1
File[1]="/home/benoit/gambas/3.0/link/share/gambas3/examples/Automation/DBusExplorer/.src/FVersiongbXML.form"
File[2]="/home/benoit/gambas/3.0/link/share/gambas3/examples/Automation/DBusExplorer/.src/FVersiongbXML.class:141.2"
Count=2
File[2]="/home/benoit/gambas/3.0/link/share/gambas3/examples/Automation/DBusExplorer/.src/FVersiongbXML.class:93.50"
File[3]="/home/benoit/gambas/3.0/link/share/gambas3/examples/Automation/DBusExplorer/Text1:0.0"
Active=4
File[4]="/home/benoit/gambas/3.0/link/share/gambas3/examples/Automation/DBusExplorer/Text2:0.0"
Count=4
[Watches]
Count=0

View file

@ -91,7 +91,7 @@ Public Sub ShowPathContent(sPath As String, sBus As String, sApplication As Stri
tvDbus.Add(sAppPath &/ s, s)
Endif
tvDbus.Add(sAppPath &/ s & "|child", "child",, sAppPath &/ s)
tvDbus[sAppPath &/ s].Picture = Picture["icon:/medium/directory"]
tvDbus[sAppPath &/ s].Picture = Picture["icon:/small/directory"]
Next

View file

@ -1,5 +1,5 @@
# Gambas Project File 3.0
# Compiled with Gambas 2.99.0 (r2606)
# Compiled with Gambas 2.99.0 (r2637)
Title=Anti-Aliased Drawing
Startup=FMain
Icon=icon.png
@ -8,5 +8,5 @@ Component=gb.image
Component=gb.gui
Description="Anti-aliased drawing with the Paint class"
Authors="Fabien Bodard\nBenoît Minisini"
Environment="GB_GUI="
Environment="GB_GUI=gb.gtk"
TabSize=2

View file

@ -563,11 +563,11 @@ static void ClosePath(GB_PAINT *d)
static void Arc(GB_PAINT *d, float xc, float yc, float radius, float angle, float length)
{
cairo_new_sub_path(CONTEXT(d));
angle = - angle;
if (length >= 0.0)
cairo_arc_negative(CONTEXT(d), xc, yc, radius, angle, angle - length);
//angle = - angle;
if (length < 0.0)
cairo_arc_negative(CONTEXT(d), xc, yc, radius, angle, angle + length);
else
cairo_arc(CONTEXT(d), xc, yc, radius, angle, angle - length);
cairo_arc(CONTEXT(d), xc, yc, radius, angle, angle + length);
}
static void Rectangle(GB_PAINT *d, float x, float y, float width, float height)

View file

@ -33,6 +33,16 @@
DECLARE_EVENT(EVENT_Change);
/*
MySpinBox::MySpinBox(QWidget *parent) : QSpinBox(parent)
{
setAccelerated(true);
lineEdit()->setAutoFillBackground(false);
}
MySpinBox::~MySpinBox()
{
}*/
BEGIN_METHOD(CSPINBOX_new, GB_OBJECT parent)

View file

@ -25,6 +25,9 @@
#include "gambas.h"
#include "gb.qt.h"
#include "CWidget.h"
//#include <QSpinBox>
#ifndef __CSPINBOX_CPP
@ -39,10 +42,17 @@ extern GB_DESC CSpinBoxDesc[];
typedef
struct {
QT_WIDGET widget;
CWIDGET widget;
}
CSPINBOX;
/*class MySpinBox : public QSpinBox
{
public:
MySpinBox(QWidget *parent = 0);
~MySpinBox();
};*/
class CSpinBox : public QObject
{
Q_OBJECT

View file

@ -570,6 +570,9 @@ static void Arc(GB_PAINT *d, float xc, float yc, float radius, float angle, floa
QRectF rect;
rect.setCoords((qreal)(xc - radius), (qreal)(yc - radius), (qreal)(xc + radius), (qreal)(yc + radius));
angle = - angle;
length = - length;
PATH(d)->arcMoveTo(rect, to_deg(angle));
PATH(d)->arcTo(rect, to_deg(angle), to_deg(length));
}

View file

@ -130,10 +130,10 @@ int main(int argc, char **argv)
{
//CLASS *class = NULL;
CLASS_DESC_METHOD *startup = NULL;
int i, n;
char *file = ".";
bool nopreload = FALSE;
const char *prog;
//char log_path[256];
//sprintf(log_path, "/tmp/gambas-%d.log", getuid());
@ -144,171 +144,150 @@ int main(int argc, char **argv)
COMMON_init();
//STRING_init();
if (strcmp(argv[0], "gbr" GAMBAS_VERSION_STRING) == 0)
prog = argv[0];
EXEC_arch = (strcmp(prog, "gbr" GAMBAS_VERSION_STRING) == 0);
if (argc == 2)
{
if (argc == 1)
{
fprintf(stderr, "gbr" GAMBAS_VERSION_STRING ": no archive file.\n");
my_exit(1);
}
if (!strcmp(argv[1], "-h") || !strcmp(argv[1], "--help"))
{
if (EXEC_arch)
{
printf(
"Usage: gbr" GAMBAS_VERSION_STRING " [options] [<executable file>] [-- <arguments>]\n\n"
"Options:\n"
" -V --version display version\n"
" -h --help display this help\n"
" -L --license display license\n"
" -g enter debugging mode\n"
#if DO_PRELOADING
" -p disable preloading\n"
#endif
" -k do not unload shared libraries\n"
" -x execute an archive\n"
"\n"
);
}
else
{
printf(
"Usage: gbx" GAMBAS_VERSION_STRING " [options] [<project file>] [-- <arguments>]\n"
" gbx" GAMBAS_VERSION_STRING " -e <expression>\n\n"
"Options:\n"
" -V --version display version\n"
" -h --help display this help\n"
" -L --license display license\n"
" -e evaluate an expression\n"
" -g enter debugging mode\n"
#if DO_PRELOADING
" -p disable preloading\n"
#endif
" -k do not unload shared libraries\n"
" -x execute an archive\n"
"\n"
);
}
EXEC_arch = TRUE;
if (strcmp(argv[1], "-p") == 0)
n = 2;
else
n = 1;
file = argv[n];
if (n == 1)
LIBRARY_preload(file, argv);
for (i = 0; i < (argc - n); i++)
argv[i] = argv[i + n];
argc -= n;
my_exit(0);
}
else if (!strcmp(argv[1], "-V") || !strcmp(argv[1], "--version"))
{
printf(VERSION "\n");
my_exit(0);
}
else if (!strcmp(argv[1], "-L") || !strcmp(argv[1], "--license"))
{
printf(
"Gambas interpreter version " VERSION " " __DATE__ " " __TIME__ "\n"
COPYRIGHT
);
my_exit(0);
}
}
else
if (!EXEC_arch && argc == 3 && !strcmp(argv[1], "-e"))
{
TRY
{
init(NULL);
EVAL_string(argv[2]);
}
CATCH
{
if (ERROR_current->info.code && ERROR_current->info.code != E_ABORT)
ERROR_print_at(stderr, TRUE, TRUE);
main_exit(TRUE);
_exit(1);
}
END_TRY
main_exit(FALSE);
_exit(0);
}
for (i = 1; i < argc; i++)
{
if (strcmp(argv[i], "-g") == 0)
{
EXEC_debug = TRUE;
}
else if (strcmp(argv[i], "-f") == 0)
{
EXEC_fifo = TRUE;
if (i < (argc - 1) && *argv[i + 1] && *argv[i + 1] != '-')
{
EXEC_fifo_name = argv[i + 1];
i++;
}
}
else if (strcmp(argv[i], "-p") == 0)
{
nopreload = TRUE;
}
else if (strcmp(argv[i], "-k") == 0)
{
EXEC_keep_library = TRUE;
}
else
{
if (strcmp(argv[i], "--"))
{
file = argv[i];
i++;
}
break;
}
}
/*else if (argc >= 2 && strcmp(argv[1], "-x") == 0)
{
if (argc == 2)
{
fprintf(stderr, "gbx: no archive file.\n");
my_exit(1);
}
EXEC_arch = TRUE;
if (i < argc)
{
if (file && strcmp(argv[i], "--"))
{
if (EXEC_arch)
fprintf(stderr, "gbr" GAMBAS_VERSION_STRING ": too many executable files.\n");
else
fprintf(stderr, "gbx" GAMBAS_VERSION_STRING ": too many project files.\n");
my_exit(1);
}
if (strcmp(argv[2], "-p") == 0)
n = 3;
else
n = 2;
i++;
}
file = argv[n];
if (n == 2)
LIBRARY_preload(file, argv);
n = i;
for (i = 1; i < (argc - n); i++)
argv[i] = argv[i + n];
if (!nopreload)
LIBRARY_preload(file, argv);
argc -= n;
}*/
else
{
if (argc == 2)
{
if (!strcmp(argv[1], "-h") || !strcmp(argv[1], "--help"))
{
printf(
"\n"
"GAMBAS Interpreter version " VERSION " " __DATE__ " " __TIME__ "\n"
COPYRIGHT
"Usage: gbx" GAMBAS_VERSION_STRING " [options] [<project file>] -- ...\n"
" gbx" GAMBAS_VERSION_STRING " -e <expression>\n\n"
"Options:\n"
" -V --version display version\n"
" -h --help display this help\n"
" -e evaluate an expression\n"
" -g enter debugging mode\n"
#if DO_PRELOADING
" -p disable preloading\n"
#endif
" -k do not unload shared libraries\n"
" -x execute an archive\n"
"\n"
);
for (i = 1; i <= (argc - n); i++)
argv[i] = argv[i + n - 1];
my_exit(0);
}
else if (!strcmp(argv[1], "-V") || !strcmp(argv[1], "--version"))
{
printf(VERSION "\n");
my_exit(0);
}
}
else
if (argc == 3 && !strcmp(argv[1], "-e"))
{
TRY
{
init(NULL);
EVAL_string(argv[2]);
}
CATCH
{
if (ERROR_current->info.code && ERROR_current->info.code != E_ABORT)
ERROR_print_at(stderr, TRUE, TRUE);
main_exit(TRUE);
_exit(1);
}
END_TRY
main_exit(FALSE);
_exit(0);
}
for (i = 1; i < argc; i++)
{
if (strcmp(argv[i], "-g") == 0)
{
EXEC_debug = TRUE;
}
else if (strcmp(argv[i], "-f") == 0)
{
EXEC_fifo = TRUE;
if (i < (argc - 1) && *argv[i + 1] && *argv[i + 1] != '-')
{
EXEC_fifo_name = argv[i + 1];
i++;
}
}
else if (strcmp(argv[i], "-p") == 0)
{
nopreload = TRUE;
}
else if (strcmp(argv[i], "-k") == 0)
{
EXEC_keep_library = TRUE;
}
else
{
if (strcmp(argv[i], "--"))
{
file = argv[i];
i++;
}
break;
}
}
if (i < argc)
{
if (file && strcmp(argv[i], "--"))
{
fprintf(stderr, "gbx" GAMBAS_VERSION_STRING ": too many project files.\n");
my_exit(1);
}
i++;
}
n = i;
if (!nopreload)
LIBRARY_preload(file, argv);
for (i = 1; i <= (argc - n); i++)
argv[i] = argv[i + n - 1];
argc -= n - 1;
//printf("argc = %d\n", argc);
/*for (i = 0; i < argc; i++)
fprintf(stderr, "argv[%d] = '%s'\n", i, argv[i]);
fprintf(stderr, "\n");*/
}
argc -= n - 1;
//printf("argc = %d\n", argc);
/*for (i = 0; i < argc; i++)
fprintf(stderr, "argv[%d] = '%s'\n", i, argv[i]);
fprintf(stderr, "\n");*/
TRY
{