[DEVELOPMENT ENVIRONMENT]

* BUG: In the open project dialog, the project icon on the right pane is 
  correctly refreshed now.

[GB.FORM]
* BUG: The Stock class now detects the Mate desktop, and use it as default 
  application theme if needed.
* NEW: The Stock class now prints debugging message if the environment
  variable GB_STOCK is set.



git-svn-id: svn://localhost/gambas/trunk@4970 867c0c6c-44f3-4631-809d-bfa615b0a4ec
This commit is contained in:
Benoît Minisini 2012-07-20 01:34:22 +00:00
parent 186bb8d5e2
commit e9fbb77562
5 changed files with 97 additions and 81 deletions

View File

@ -298,7 +298,7 @@ msgstr ""
msgid "Not finished but stable" msgid "Not finished but stable"
msgstr "" msgstr ""
#: CComponentBox.class:235 ProjectItem.class:63 #: CComponentBox.class:235 ProjectItem.class:64
msgid "Authors" msgid "Authors"
msgstr "" msgstr ""
@ -411,7 +411,7 @@ msgstr ""
#: FList.form:121 FMain.class:198 FMakeInstall.class:356 FMenu.form:377 #: FList.form:121 FMain.class:198 FMakeInstall.class:356 FMenu.form:377
#: FNewConnection.form:255 FNewTable.form:86 FNewTranslation.form:21 #: FNewConnection.form:255 FNewTable.form:86 FNewTranslation.form:21
#: FOpenProject.form:177 FOption.class:644 FPasteSpecial.form:77 #: FOpenProject.form:177 FOption.class:644 FPasteSpecial.form:77
#: FPasteTable.form:107 FPropertyComponent.form:221 FPropertyProject.form:719 #: FPasteTable.form:107 FPropertyComponent.form:221 FPropertyProject.form:726
#: FProxy.form:57 FReportBorderChooser.form:48 FReportBrushChooser.form:34 #: FProxy.form:57 FReportBorderChooser.form:48 FReportBrushChooser.form:34
#: FReportCoordChooser.form:26 FReportPaddingChooser.form:75 FSave.form:28 #: FReportCoordChooser.form:26 FReportPaddingChooser.form:75 FSave.form:28
#: FSaveProjectAs.form:76 FSearch.class:838 FSelectExtraFile.form:43 #: FSaveProjectAs.form:76 FSearch.class:838 FSelectExtraFile.form:43
@ -462,7 +462,7 @@ msgstr ""
#: FMain.class:1757 FMakeInstall.class:302 FMenu.form:372 #: FMain.class:1757 FMakeInstall.class:302 FMenu.form:372
#: FNewConnection.form:249 FNewTable.form:80 FNewTranslation.form:15 #: FNewConnection.form:249 FNewTable.form:80 FNewTranslation.form:15
#: FOpenProject.form:171 FPasteSpecial.form:71 FPropertyComponent.form:215 #: FOpenProject.form:171 FPasteSpecial.form:71 FPropertyComponent.form:215
#: FPropertyProject.form:713 FProxy.form:63 FReportBorderChooser.form:54 #: FPropertyProject.form:720 FProxy.form:63 FReportBorderChooser.form:54
#: FReportBrushChooser.form:40 FReportCoordChooser.form:32 #: FReportBrushChooser.form:40 FReportCoordChooser.form:32
#: FReportPaddingChooser.form:69 FSelectExtraFile.form:37 FSelectIcon.form:82 #: FReportPaddingChooser.form:69 FSelectExtraFile.form:37 FSelectIcon.form:82
#: FSnippet.form:51 FTableChooser.form:62 FText.form:35 #: FSnippet.form:51 FTableChooser.form:62 FText.form:35
@ -532,7 +532,7 @@ msgstr ""
msgid "Project commit" msgid "Project commit"
msgstr "" msgstr ""
#: FCommit.form:52 FMakeInstall.form:215 FPropertyProject.form:235 #: FCommit.form:52 FMakeInstall.form:215 FPropertyProject.form:242
msgid "Description" msgid "Description"
msgstr "" msgstr ""
@ -979,7 +979,7 @@ msgid "Style sheet"
msgstr "" msgstr ""
#: FCreateFile.form:299 FCreateProject.form:273 FImportTable.form:51 #: FCreateFile.form:299 FCreateProject.form:273 FImportTable.form:51
#: FPropertyComponent.form:56 FPropertyProject.form:257 FSearch.form:100 #: FPropertyComponent.form:56 FPropertyProject.form:264 FSearch.form:100
msgid "Options" msgid "Options"
msgstr "" msgstr ""
@ -1063,7 +1063,7 @@ msgstr ""
msgid "New project" msgid "New project"
msgstr "" msgstr ""
#: FCreateProject.form:81 FPropertyProject.form:178 #: FCreateProject.form:81 FPropertyProject.form:185
msgid "Project type" msgid "Project type"
msgstr "" msgstr ""
@ -1247,7 +1247,7 @@ msgid "Remove current expression"
msgstr "" msgstr ""
#: FDebugInfo.form:127 FMain.form:776 FMakeInstall.form:575 FOption.form:856 #: FDebugInfo.form:127 FMain.form:776 FMakeInstall.form:575 FOption.form:856
#: FPropertyComponent.form:190 FPropertyProject.form:457 #: FPropertyComponent.form:190 FPropertyProject.form:464
msgid "&Remove" msgid "&Remove"
msgstr "" msgstr ""
@ -1854,7 +1854,7 @@ msgstr ""
msgid "Modify documentation..." msgid "Modify documentation..."
msgstr "" msgstr ""
#: FHelpBrowser.class:24 FPropertyProject.form:368 #: FHelpBrowser.class:24 FPropertyProject.form:375
msgid "Default language" msgid "Default language"
msgstr "" msgstr ""
@ -2064,7 +2064,7 @@ msgstr ""
msgid "&1 records imported." msgid "&1 records imported."
msgstr "" msgstr ""
#: FInfo.form:61 FPropertyComponent.form:51 FPropertyProject.form:147 #: FInfo.form:61 FPropertyComponent.form:51 FPropertyProject.form:154
msgid "General" msgid "General"
msgstr "" msgstr ""
@ -2084,7 +2084,7 @@ msgstr ""
msgid "Directory" msgid "Directory"
msgstr "" msgstr ""
#: FInfo.form:147 FPropertyProject.form:661 #: FInfo.form:147 FPropertyProject.form:668
msgid "Versioning" msgid "Versioning"
msgstr "" msgstr ""
@ -2176,7 +2176,7 @@ msgstr ""
msgid "Edit list property" msgid "Edit list property"
msgstr "" msgstr ""
#: FList.form:58 FMenu.form:82 FPropertyProject.form:451 #: FList.form:58 FMenu.form:82 FPropertyProject.form:458
msgid "&Insert" msgid "&Insert"
msgstr "" msgstr ""
@ -2508,7 +2508,7 @@ msgstr ""
msgid "Save project as" msgid "Save project as"
msgstr "" msgstr ""
#: FMain.form:916 FPropertyProject.form:110 #: FMain.form:916 FPropertyProject.form:111
msgid "Project properties" msgid "Project properties"
msgstr "" msgstr ""
@ -3267,7 +3267,7 @@ msgstr ""
msgid "Default font size" msgid "Default font size"
msgstr "" msgstr ""
#: FOption.form:232 FPropertyProject.form:185 #: FOption.form:232 FPropertyProject.form:192
msgid "Normal" msgid "Normal"
msgstr "" msgstr ""
@ -3291,11 +3291,11 @@ msgstr ""
msgid "Sort properties" msgid "Sort properties"
msgstr "" msgstr ""
#: FOption.form:283 FPropertyComponent.form:90 FPropertyProject.form:315 #: FOption.form:283 FPropertyComponent.form:90 FPropertyProject.form:322
msgid "No" msgid "No"
msgstr "" msgstr ""
#: FOption.form:283 FPropertyComponent.form:90 FPropertyProject.form:315 #: FOption.form:283 FPropertyComponent.form:90 FPropertyProject.form:322
msgid "Yes" msgid "Yes"
msgstr "" msgstr ""
@ -3319,7 +3319,7 @@ msgstr ""
msgid "Default tab size" msgid "Default tab size"
msgstr "" msgstr ""
#: FOption.form:392 FPropertyProject.form:290 #: FOption.form:392 FPropertyProject.form:297
msgid "space(s)" msgid "space(s)"
msgstr "" msgstr ""
@ -3738,7 +3738,7 @@ msgstr ""
msgid "Features" msgid "Features"
msgstr "" msgstr ""
#: FPropertyComponent.form:152 FPropertyProject.form:517 #: FPropertyComponent.form:152 FPropertyProject.form:524
msgid "Components" msgid "Components"
msgstr "" msgstr ""
@ -3750,142 +3750,146 @@ msgstr ""
msgid "Cannot write component description file." msgid "Cannot write component description file."
msgstr "" msgstr ""
#: FPropertyProject.form:119 #: FPropertyProject.form:120
msgid "GB_GUI=gb.qt4" msgid "GB_GUI=gb.qt4"
msgstr "" msgstr ""
#: FPropertyProject.form:125 #: FPropertyProject.form:126
msgid "GB_GUI=gb.gtk" msgid "GB_GUI=gb.gtk"
msgstr "" msgstr ""
#: FPropertyProject.form:131 #: FPropertyProject.form:132
msgid "GB_STOCK=debug"
msgstr ""
#: FPropertyProject.form:138
msgid "GB_JIT=debug" msgid "GB_JIT=debug"
msgstr "" msgstr ""
#: FPropertyProject.form:137 #: FPropertyProject.form:144
msgid "LANG=C ; LC_ALL=C" msgid "LANG=C ; LC_ALL=C"
msgstr "" msgstr ""
#: FPropertyProject.form:185 #: FPropertyProject.form:192
msgid "Library" msgid "Library"
msgstr "" msgstr ""
#: FPropertyProject.form:185 #: FPropertyProject.form:192
msgid "Component" msgid "Component"
msgstr "" msgstr ""
#: FPropertyProject.form:191 #: FPropertyProject.form:198
msgid "Version" msgid "Version"
msgstr "" msgstr ""
#: FPropertyProject.form:217 #: FPropertyProject.form:224
msgid "Get from 'VERSION' file" msgid "Get from 'VERSION' file"
msgstr "" msgstr ""
#: FPropertyProject.form:224 #: FPropertyProject.form:231
msgid "Title" msgid "Title"
msgstr "" msgstr ""
#: FPropertyProject.form:247 #: FPropertyProject.form:254
msgid "Author(s)" msgid "Author(s)"
msgstr "" msgstr ""
#: FPropertyProject.form:267 #: FPropertyProject.form:274
msgid "Edition" msgid "Edition"
msgstr "" msgstr ""
#: FPropertyProject.form:278 #: FPropertyProject.form:285
msgid "Tab size" msgid "Tab size"
msgstr "" msgstr ""
#: FPropertyProject.form:298 #: FPropertyProject.form:305
msgid "Compilation" msgid "Compilation"
msgstr "" msgstr ""
#: FPropertyProject.form:309 #: FPropertyProject.form:316
msgid "Module symbols are public by default" msgid "Module symbols are public by default"
msgstr "" msgstr ""
#: FPropertyProject.form:326 #: FPropertyProject.form:333
msgid "Form controls are public" msgid "Form controls are public"
msgstr "" msgstr ""
#: FPropertyProject.form:340 FTranslate.form:64 #: FPropertyProject.form:347 FTranslate.form:64
msgid "Translation" msgid "Translation"
msgstr "" msgstr ""
#: FPropertyProject.form:351 #: FPropertyProject.form:358
msgid "Project is translatable" msgid "Project is translatable"
msgstr "" msgstr ""
#: FPropertyProject.form:383 #: FPropertyProject.form:390
msgid "Debugging" msgid "Debugging"
msgstr "" msgstr ""
#: FPropertyProject.form:394 #: FPropertyProject.form:401
msgid "Activate profiling" msgid "Activate profiling"
msgstr "" msgstr ""
#: FPropertyProject.form:411 #: FPropertyProject.form:418
msgid "Use a terminal emulator" msgid "Use a terminal emulator"
msgstr "" msgstr ""
#: FPropertyProject.form:422 #: FPropertyProject.form:429
msgid "Environment" msgid "Environment"
msgstr "" msgstr ""
#: FPropertyProject.form:432 #: FPropertyProject.form:439
msgid "Arguments" msgid "Arguments"
msgstr "" msgstr ""
#: FPropertyProject.form:485 #: FPropertyProject.form:492
msgid "Environment variables" msgid "Environment variables"
msgstr "" msgstr ""
#: FPropertyProject.form:526 #: FPropertyProject.form:533
msgid "Show only components used in project" msgid "Show only components used in project"
msgstr "" msgstr ""
#: FPropertyProject.form:532 #: FPropertyProject.form:539
msgid "Show components in beta version" msgid "Show components in beta version"
msgstr "" msgstr ""
#: FPropertyProject.form:556 #: FPropertyProject.form:563
msgid "About &component..." msgid "About &component..."
msgstr "" msgstr ""
#: FPropertyProject.form:567 #: FPropertyProject.form:574
msgid "&Reset" msgid "&Reset"
msgstr "" msgstr ""
#: FPropertyProject.form:588 #: FPropertyProject.form:595
msgid "Libraries" msgid "Libraries"
msgstr "" msgstr ""
#: FPropertyProject.form:607 #: FPropertyProject.form:614
msgid "" msgid ""
"<b>WARNING!</b> The project executable and the libraries it depends on must " "<b>WARNING!</b> The project executable and the libraries it depends on must "
"be stored inside the same directory. Otherwise the libraries will not be " "be stored inside the same directory. Otherwise the libraries will not be "
"found." "found."
msgstr "" msgstr ""
#: FPropertyProject.form:629 #: FPropertyProject.form:636
msgid "&Add..." msgid "&Add..."
msgstr "" msgstr ""
#: FPropertyProject.form:669 #: FPropertyProject.form:676
msgid "Changes since last commit" msgid "Changes since last commit"
msgstr "" msgstr ""
#: FPropertyProject.form:692 #: FPropertyProject.form:699
msgid "&Update" msgid "&Update"
msgstr "" msgstr ""
#: FPropertyProject.form:698 #: FPropertyProject.form:705
msgid "&Revert..." msgid "&Revert..."
msgstr "" msgstr ""
#: FPropertyProject.form:704 #: FPropertyProject.form:711
msgid "&Commit..." msgid "&Commit..."
msgstr "" msgstr ""
@ -6084,7 +6088,7 @@ msgstr ""
msgid "Unable to convert &1" msgid "Unable to convert &1"
msgstr "" msgstr ""
#: ProjectItem.class:63 #: ProjectItem.class:64
msgid "Author" msgid "Author"
msgstr "" msgstr ""

View File

@ -17,6 +17,11 @@
Text = ("GB_GUI=gb.gtk") Text = ("GB_GUI=gb.gtk")
Tag = "GB_GUI=gb.gtk" Tag = "GB_GUI=gb.gtk"
} }
{ munInsertEnvStock Menu mnuInsertEnv
Name = "munInsertEnvStock"
Text = ("GB_STOCK=debug")
Tag = "GB_STOCK=debug"
}
{ mnuInsertEnvJIT Menu mnuInsertEnv { mnuInsertEnvJIT Menu mnuInsertEnv
Name = "mnuInsertEnvJIT" Name = "mnuInsertEnvJIT"
Text = ("GB_JIT=debug") Text = ("GB_JIT=debug")

View File

@ -38,6 +38,7 @@ Private Sub SetPath(sPath As String)
$sPath = sPath $sPath = sPath
$hProjectInfo = New CProjectInfo(sPath) $hProjectInfo = New CProjectInfo(sPath)
$hIcon = Null
$hDrawingArea.ToolTip = Replace($sPath, System.User.Home, "~") $hDrawingArea.ToolTip = Replace($sPath, System.User.Home, "~")
Me.H = Me.IdealHeight Me.H = Me.IdealHeight

View File

@ -1,5 +1,7 @@
' Gambas class file ' Gambas class file
' Gambas class file
Export Export
Static Property Debug As Boolean Static Property Debug As Boolean
@ -15,29 +17,47 @@ Static Private $bDebug As Boolean
Class _DefaultStock Class _DefaultStock
Static Private Sub SearchDesktop() Static Private Sub GetDesktop() As String
Dim sOutput As String Dim sOutput As String
If Application.Theme Then Return
If Application.Env["KDE_FULL_SESSION"] Then If Application.Env["KDE_FULL_SESSION"] Then
If Application.Env["KDE_SESSION_VERSION"] = "4" Then If Application.Env["KDE_SESSION_VERSION"] = "4" Then
Application.Theme = "kde4" Return "KDE4"
Else Else
Application.Theme = "kde" Return "KDE"
Endif Endif
Else If Application.Env["GNOME_DESKTOP_SESSION_ID"] Then Else If Application.Env["GNOME_DESKTOP_SESSION_ID"] Then
Application.Theme = "gnome" Return "GNOME"
Else If Application.Env["MATE_DESKTOP_SESSION_ID"] Or If Application.Env["MATECORBA_SOCKETDIR"] Then
Return "MATE"
Else If Application.Env["E_BIN_DIR"] And If Application.Env["E_LIB_DIR"] Then
Return "ENLIGHTENMENT"
Else If Application.Env["WMAKER_BIN_NAME"] Then
Return "WINDOWMAKER"
Else If Application.Env["DESKTOP_SESSION"] = "LXDE" Then
Return "LXDE"
Else Else
Shell "xprop -root XFCE_DESKTOP_WINDOW" To sOutput Shell "xprop -root XFCE_DESKTOP_WINDOW" To sOutput
If sOutput Then Application.Theme = "xfce" If sOutput Then Return "XFCE"
Endif Endif
Return ""
Catch Catch
End End
Static Private Sub SearchDesktop()
Dim sDesktop As String
If Application.Theme Then Return
sDesktop = GetDesktop()
If $bDebug Then Error "gb.form: desktop is " & sDesktop
Application.Theme = LCase(sDesktop)
End
Static Private Sub LoadMap(sMap As String) Static Private Sub LoadMap(sMap As String)
Dim hFile As File Dim hFile As File
@ -83,7 +103,7 @@ Static Private Sub AddPath(sMap As String, sPath As String, Optional sPattern As
If sMap Then sPath = sMap & ":" & sPath If sMap Then sPath = sMap & ":" & sPath
If Not $aIconPath.Exist(sPath) Then If Not $aIconPath.Exist(sPath) Then
$aIconPath.Add(sPath) $aIconPath.Add(sPath)
If $bDebug Then Debug sPath If $bDebug Then Error "gb.form: add icon path: "; sPath
Endif Endif
End End
@ -100,7 +120,7 @@ Static Private Sub InitTheme()
Dim sTheme As String Dim sTheme As String
If Not $bDebug Then If Not $bDebug Then
If Application.Env["GB_STOCK_DEBUG"] Then $bDebug = True If Application.Env["GB_STOCK"] Then $bDebug = True
Endif Endif
$aIconPath = New String[] $aIconPath = New String[]
@ -110,7 +130,7 @@ Static Private Sub InitTheme()
Select Case LCase(Application.Theme) Select Case LCase(Application.Theme)
Case "gnome" Case "gnome", "mate"
Try Exec ["gconftool-2", "-g", "/desktop/gnome/interface/icon_theme"] To sTheme Try Exec ["gconftool-2", "-g", "/desktop/gnome/interface/icon_theme"] To sTheme

View File

@ -24,23 +24,9 @@ SearchComment=False
SearchString=True SearchString=True
[OpenFile] [OpenFile]
File[1]=".src/_Desktop_Passwords.class:83.16" Active=1
File[2]=".src/DesktopWindow.class:120.0" File[1]=".src/Desktop.class:207.0"
File[3]=".src/Atom.class:8.14" Count=1
File[4]=".src/Main.module:8.28"
File[5]=".src/_DesktopVirtual.class:0.0"
File[6]=".src/Desktop.class:65.2"
File[7]=".src/_Desktop_Windows.class:55.2"
File[8]=".src/_Desktop_ScreenSaver.class:0.0"
File[9]="xdg-utils/xdg-screensaver:0.0"
File[10]="xdg-utils/xdg-su:0.0"
File[11]="xdg-utils/xdg-settings:0.0"
File[12]="xdg-utils/xdg-copy:0.0"
File[13]="xdg-utils/xdg-email:0.0"
File[14]="xdg-utils/xdg-open:559.13"
Active=15
File[15]="xdg-utils/xdg-terminal:0.0"
Count=15
[Watches] [Watches]
Count=0 Count=0