Mercurial > projects > dwt-samples
changeset 65:a84ba4d1820f
restructure the dsss.conf and resources
line wrap: on
line diff
--- a/dsss.conf Fri Apr 11 17:45:55 2008 +0200 +++ b/dsss.conf Fri Apr 11 21:15:36 2008 +0200 @@ -1,32 +1,27 @@ [*] buildflags+=-g -gc - -#used for dwtsnippets/text/Snippet258 -#dwtsnippets/expandbar/Snippet223 buildflags+=-Jres version(Windows){ + # if no console window is wanted/needed use 'windows' instead of 'console' #buildflags+= -L/SUBSYSTEM:windows:5 buildflags+= -L/SUBSYSTEM:console:5 buildflags+= -L/rc:dwt } -# It seems this is no longer needed -# The linker error work around -# This is only needed if Tango was -# installed with DSSS -#version(linux){ - #buildflags+= -L-lDD-tango-util -#} +[dwtexamples/simple.d] -[dwtexamples/simple.d] +[dwtexamples/addressbook/AddressBook.d] [dwtexamples/clipboard/ClipboardExample.d] +[dwtexamples/controlexample/ControlExample.d] +[dwtexamples/controlexample/CustomControlExample.d] [dwtexamples/helloworld/HelloWorld1.d] [dwtexamples/helloworld/HelloWorld2.d] [dwtexamples/helloworld/HelloWorld3.d] [dwtexamples/helloworld/HelloWorld4.d] [dwtexamples/helloworld/HelloWorld5.d] +[dwtexamples/texteditor/TextEditor.d] [dwtsnippets/button/Snippet293.d] [dwtsnippets/control/Snippet25.d] @@ -76,6 +71,11 @@ [user/torhu_synctest.d] [user/region_shell.d] +version(Derelict){ + [dwtsnippets/opengl/Snippet174.d] + [dwtsnippets/opengl/Snippet195.d] +} + version(DwtAddons){ [dwtexamples/sleak/SleakExample.d] [jface/ActionAndStatusbar.d] @@ -84,43 +84,5 @@ [jface/ShowFieldPrefs.d] } -version(Derelict){ - [dwtsnippets/opengl/Snippet174.d] - [dwtsnippets/opengl/Snippet195.d] -} - -[dwtexamples/addressbook/AddressBook.d] -buildflags+=-g -gc -debug -version(Windows){ - buildflags+= -L/SUBSYSTEM:console:5 - buildflags+= -L/rc:dwt -} -buildflags+=-Jdwtexamples/addressbook - -[dwtexamples/controlexample/ControlExample.d] -buildflags+=-g -gc -debug -version(Windows){ - buildflags+= -L/SUBSYSTEM:console:5 - buildflags+= -L/rc:dwt -} -buildflags+=-Jdwtexamples/controlexample -buildflags+=-version=CONTROL_EXAMPLE_MAIN - -[dwtexamples/controlexample/CustomControlExample.d] -buildflags+=-g -gc -debug -version(Windows){ - buildflags+= -L/SUBSYSTEM:console:5 - buildflags+= -L/rc:dwt -} -buildflags+=-Jdwtexamples/controlexample -buildflags+=-version=CUSTOM_CONTROL_EXAMPLE_MAIN - -[dwtexamples/texteditor/TextEditor.d] -buildflags+=-g -gc -debug -version(Windows){ - buildflags+= -L/SUBSYSTEM:console:5 - buildflags+= -L/rc:dwt -} -buildflags+=-Jdwtexamples/texteditor
--- a/dwtexamples/addressbook/AddressBook.d Fri Apr 11 17:45:55 2008 +0200 +++ b/dwtexamples/addressbook/AddressBook.d Fri Apr 11 21:15:36 2008 +0200 @@ -66,7 +66,7 @@ public class AddressBook { private static ResourceBundle resAddressBook; - private static const char[] resAddressBookData = cast(char[]) import( "addressbook.properties" ); + private static const char[] resAddressBookData = cast(char[]) import( "dwtexamples.addressbook.addressbook.properties" ); private Shell shell; private Table table;
--- a/dwtexamples/addressbook/addressbook.properties Fri Apr 11 17:45:55 2008 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,69 +0,0 @@ -############################################################################### -# Copyright (c) 2000, 2003 IBM Corporation and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 -# which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html -# -# Contributors: -# IBM Corporation - initial API and implementation -############################################################################### -Last_name = Last Name -First_name = First Name -Business_phone = Business Phone -Home_phone = Home Phone -Email = Email -Fax = Fax -Close_save = The address book contents have changed.\nDo you want to save the changes? -New_title = Untitled -Column = Column: -Book_extension = .adr -Book_filter_name = Address Books -All_filter_name = All Files -File = File -Does_not_exist = does not exist. -File_not_found = File not found: -IO_error_read = IO error reading text file: -IO_error_write = IO error writing text file: -IO_error_close = IO error closing text file: -Title_bar = Address Book - -Save_as_title = Save As -Query_overwrite = already exists.\nDo you want to replace it? -File_menu_title = &File -New_contact = &New Contact...\tCtrl+N -Edit_contact = &Edit Contact...\tCtrl+E -New_address_book = New Address &Book\tCtrl+B -Open_address_book = &Open Address Book...\tCtrl+O -Save_address_book = &Save Address Book\tCtrl+S -Save_book_as = Save &Address Book As...\tCtrl+A -Exit = E&xit -Edit_menu_title = &Edit -Edit = &Edit...\tCtrl+E -Copy = &Copy\tCtrl+C -Paste = &Paste\tCtrl+V -Delete = De&lete\tDel -Sort = &Sort -Search_menu_title = &Search -Find = &Find...\tCtrl+F -Find_next = Find &Next...\tF3 -Pop_up_new = &New... -Pop_up_edit = &Edit... -Pop_up_copy = &Copy -Pop_up_paste = &Paste -Pop_up_delete = &Delete -Pop_up_find = &Find... -Help_menu_title = &Help -About = &About Address Book... -About_1 = About -About_2 = \nversion 1.0 -OK = OK -Cancel = Cancel -Search_dialog_title = Find -Dialog_find_what = Fi&nd what: -Dialog_match_case = Match &case -Dialog_match_word = Match &whole word -Dialog_direction = Direction -Dialog_dir_up = &Up -Dialog_dir_down = &Down -Dialog_find = &Find -Cannot_find = Cannot find \ No newline at end of file
--- a/dwtexamples/controlexample/ControlExample.d Fri Apr 11 17:45:55 2008 +0200 +++ b/dwtexamples/controlexample/ControlExample.d Fri Apr 11 21:15:36 2008 +0200 @@ -63,8 +63,37 @@ import jive.stacktrace; } -version( CONTROL_EXAMPLE_MAIN ){ - void main(){ +interface IControlExampleFactory{ + ControlExample create(Shell shell, char[] title); +} + +void main(){ + Display display = new Display(); + Shell shell = new Shell(display, DWT.SHELL_TRIM); + shell.setLayout(new FillLayout()); + + IControlExampleFactory ifactory; + char[] key; + if( auto factory = ClassInfo.find( "dwtexamples.controlexample.CustomControlExample.CustomControlExampleFactory" )){ + ifactory = cast(IControlExampleFactory) factory.create; + key = "custom.window.title"; + } + else{ + ifactory = new ControlExampleFactory(); + key = "window.title"; + } + auto instance = ifactory.create( shell, key ); + ControlExample.setShellSize(instance, shell); + shell.open(); + while (! shell.isDisposed()) { + if (! display.readAndDispatch()) display.sleep(); + } + instance.dispose(); + display.dispose(); +} + +public class ControlExampleFactory : IControlExampleFactory { + ControlExample create(Shell shell, char[] title){ Stdout.formatln( "The ControlExample: still work left" ); Stdout.formatln( "todo: Implement Get/Set API reflection" ); Stdout.formatln( "" ); @@ -89,13 +118,15 @@ Stdout.formatln( "" ); } Stdout.formatln( "please report problems" ); - ControlExample.main( null ); + auto res = new ControlExample( shell ); + shell.setText(ControlExample.getResourceString("window.title")); + return res; } } public class ControlExample { private static ResourceBundle resourceBundle; - private static const char[] resourceData = import( "controlexample.properties" ); + private static const char[] resourceData = import( "dwtexamples.controlexample.controlexample.properties" ); private ShellTab shellTab; private TabFolder tabFolder; @@ -105,11 +136,11 @@ static const int ciClosedFolder = 0, ciOpenFolder = 1, ciTarget = 2, ciBackground = 3, ciParentBackground = 4; static const byte[][] imageData = [ - cast(byte[]) import( "closedFolder.gif" ), - cast(byte[]) import( "openFolder.gif" ), - cast(byte[]) import( "target.gif" ), - cast(byte[]) import( "backgroundImage.png" ), - cast(byte[]) import( "parentBackgroundImage.png" ) + cast(byte[]) import( "dwtexamples.controlexample.closedFolder.gif" ), + cast(byte[]) import( "dwtexamples.controlexample.openFolder.gif" ), + cast(byte[]) import( "dwtexamples.controlexample.target.gif" ), + cast(byte[]) import( "dwtexamples.controlexample.backgroundImage.png" ), + cast(byte[]) import( "dwtexamples.controlexample.parentBackgroundImage.png" ) ]; static const int[] imageTypes = [ DWT.ICON, @@ -284,24 +315,6 @@ } /** - * Invokes as a standalone program. - */ - public static void main(char[][] args) { - Display display = new Display(); - Shell shell = new Shell(display, DWT.SHELL_TRIM); - shell.setLayout(new FillLayout()); - ControlExample instance = new ControlExample(shell); - shell.setText(getResourceString("window.title")); - setShellSize(instance, shell); - shell.open(); - while (! shell.isDisposed()) { - if (! display.readAndDispatch()) display.sleep(); - } - instance.dispose(); - display.dispose(); - } - - /** * Grabs input focus. */ public void setFocus() {
--- a/dwtexamples/controlexample/CustomControlExample.d Fri Apr 11 17:45:55 2008 +0200 +++ b/dwtexamples/controlexample/CustomControlExample.d Fri Apr 11 21:15:36 2008 +0200 @@ -27,17 +27,22 @@ import dwtexamples.controlexample.StyledTextTab; import dwtexamples.controlexample.Tab; -version( CUSTOM_CONTROL_EXAMPLE_MAIN ){ - void main(){ +public class CustomControlExampleFactory : IControlExampleFactory { + CustomControlExample create(Shell shell, char[] title) { + Stdout.formatln( "The CustomControlExample: still work left" ); Stdout.formatln( "warning in Control:setBounds() line=695 gtk_widget_size_allocate()" ); Stdout.formatln( "Gtk-WARNING **: gtk_widget_size_allocate(): attempt to allocate widget with width -5 and height 15" ); Stdout.formatln( "for the CTabFolder widget. Params are OK. Further bugtracking needed." ); Stdout.formatln( "please report problems" ); - CustomControlExample.main( null ); + + auto res = new CustomControlExample( shell ); + shell.setText(ControlExample.getResourceString("custom.window.title")); + return res; } } + public class CustomControlExample : ControlExample { /** @@ -62,21 +67,4 @@ new StyledTextTab (this) ]; } - - /** - * Invokes as a standalone program. - */ - public static void main(char[][] args) { - Display display = new Display(); - Shell shell = new Shell(display); - shell.setLayout(new FillLayout()); - CustomControlExample instance = new CustomControlExample(shell); - shell.setText(getResourceString("custom.window.title")); - setShellSize(instance, shell); - shell.open(); - while (! shell.isDisposed()) { - if (! display.readAndDispatch()) display.sleep(); - } - instance.dispose(); - } }
--- a/dwtexamples/controlexample/StyledTextTab.d Fri Apr 11 17:45:55 2008 +0200 +++ b/dwtexamples/controlexample/StyledTextTab.d Fri Apr 11 21:15:36 2008 +0200 @@ -168,12 +168,12 @@ styledTextStyleGroup.setLayoutData (data); /* Get images */ - boldImage = createBitmapImage (display, import("bold.bmp"), import("bold_mask.bmp")); - italicImage = createBitmapImage (display, import("italic.bmp"), import("italic_mask.bmp")); - redImage = createBitmapImage (display, import("red.bmp"), import("red_mask.bmp")); - yellowImage = createBitmapImage (display, import("yellow.bmp"), import("yellow_mask.bmp")); - underlineImage = createBitmapImage (display, import("underline.bmp"), import("underline_mask.bmp")); - strikeoutImage = createBitmapImage (display, import("strikeout.bmp"), import("strikeout_mask.bmp")); + boldImage = createBitmapImage (display, import("dwtexamples.controlexample.bold.bmp"), import("dwtexamples.controlexample.bold_mask.bmp")); + italicImage = createBitmapImage (display, import("dwtexamples.controlexample.italic.bmp"), import("dwtexamples.controlexample.italic_mask.bmp")); + redImage = createBitmapImage (display, import("dwtexamples.controlexample.red.bmp"), import("dwtexamples.controlexample.red_mask.bmp")); + yellowImage = createBitmapImage (display, import("dwtexamples.controlexample.yellow.bmp"), import("dwtexamples.controlexample.yellow_mask.bmp")); + underlineImage = createBitmapImage (display, import("dwtexamples.controlexample.underline.bmp"), import("dwtexamples.controlexample.underline_mask.bmp")); + strikeoutImage = createBitmapImage (display, import("dwtexamples.controlexample.strikeout.bmp"), import("dwtexamples.controlexample.strikeout_mask.bmp")); /* Create controls to modify the StyledText */ Label label = new Label (styledTextStyleGroup, DWT.NONE);
--- a/dwtexamples/controlexample/controlexample.properties Fri Apr 11 17:45:55 2008 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,255 +0,0 @@ -############################################################################### -# Copyright (c) 2000, 2005 IBM Corporation and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 -# which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html -# -# Contributors: -# IBM Corporation - initial API and implementation -############################################################################### -error.CouldNotLoadResources = Unable to load resources -window.title = SWT Controls -custom.window.title = SWT Custom Controls - -Text_Buttons = Text Buttons -Size = Size -Alignment = Alignment -Left = Left -Right = Right -Up = Up -Down = Down -Center = Center -One = One -Two = Two -Three = Three -Image_Buttons = Image Buttons -Image_Text_Buttons = Image and Text Buttons -Control_Example = Control Example -Parameters = Parameters -Other = Other -Enabled = Enabled -Visible = Visible -BackgroundImage = Background Image -Preferred = Preferred -Styles = Styles -Menu_Styles = Menu Styles -MenuItem_Styles = MenuItem Styles -Background_Mode = Background Mode on Parent -Listeners = Listeners -Select_Listeners = Select Listeners -Listen = Listen -Clear = Clear -Set_Get = Set/Get API -Parameter_Info = {0} e.g. {1} -Info_int = 4 -Info_intA = 0,1,2 -Info_long = 4 -Info_longA = 0,1,2 -Info_char = c -Info_charA = a,b,c -Info_boolean = true -Info_booleanA = true,true,false -Info_String = hello -Info_StringA = hello,there -Info_Point = 0,0 -Info_TabItem = Tab 0 -Info_TabItemA = Tab 0,Tab 2 -Info_TableItem = Index:2 -Info_TableItemA = Index:2,Index:4 -Info_TreeItem = Node 1 -Info_TreeItemA = Node 1,Node 3 -Select_All = Select All -Deselect_All = Deselect All -OK = OK -FillDamage = Fill Damaged Area With Color -Title_Text = Title Text -Text_Labels = Text Labels -Image_Labels = Image Labels -Custom_Labels = Custom Labels -Custom_Combo = Custom Combo -One_Two_Three = One Two Three -Text_ToolBar = Text ToolBar -Image_ToolBar = Image ToolBar -ImageText_ToolBar = Image and Text ToolBar -Maximum = Maximum -Minimum = Minimum -Selection = Selection -Increment = Increment -Page_Increment = Page Increment -Thumb = Thumb -Digits = Digits -Tree_With_Images = Tree With Images -Dialog_Type = Dialog Type -Create_Dialog = Create Dialog -Button_Styles = Button Styles -Icon_Styles = Icon Styles -Modal_Styles = Modal Styles -File_Dialog_Styles = File Dialog Styles -Item_Styles = Item Styles -Dialog_Result = Dialog Result -ColorDialog = ColorDialog -DirectoryDialog = DirectoryDialog -FileDialog = FileDialog -FontDialog = FontDialog -PrintDialog = PrintDialog -MessageBox = MessageBox -Multi_line = A multi line text widget. -Example_string = The quick brown fox jumps over the lazy dog. -Header_Visible = Header Visible -Sort_Indicator = Sort Indicator -Header_Images = Header Images -Sub_Images = Sub Images -Lines_Visible = Lines Visible -Moveable_Columns = Moveable Columns -Multiple_Columns = Multiple Columns -Locked = Locked -Combo_child = Combo Child -Node_1 = Node 1 -Node_2 = Node 2 -Node_3 = Node 3 -Node_4 = Node 4 -Node_1_1 = Node 1.1 -Node_2_1 = Node 2.1 -Node_3_1 = Node 3.1 -Node_2_2 = Node 2.2 -Node_2_2_1 = Node 2.2.1 -Parent = Parent -No_Parent = No Parent -Decoration_Styles = Decoration Styles -Create_Shell = Create Shell -Close_All_Shells = Close All Shells -Push = Push -Radio = Radio -Check = Check -Cascade = Cascade -Drop_Down = Drop Down -Images_failed = Warning: Failed to load images -readme_txt = readme.txt -Index = Index: -Title = Title: -Close = Close -Result = Result: {0} -FilterName_0 = Text Files -FilterName_1 = Batch Files -FilterName_2 = Doc Files -FilterName_3 = All Files -TableTitle_0 = Name -TableTitle_1 = Type -TableTitle_2 = Size -TableTitle_3 = Modified -TableLine0_0 = <empty> -TableLine0_1 = classes -TableLine0_2 = 0 -TableLine0_3 = today -TableLine1_0 = <empty> -TableLine1_1 = databases -TableLine1_2 = 2556 -TableLine1_3 = tomorrow -TableLine2_0 = <empty> -TableLine2_1 = images -TableLine2_2 = 91571 -TableLine2_3 = yesterday -ListData0_0 = Line 1 -ListData0_1 = Line 2 -ListData0_2 = Line 3 -ListData0_3 = Line 4 -ListData0_4 = Line 5 -ListData0_5 = Line 6 -ListData0_6 = Line 7 -ListData0_7 = Line 8 -ListData0_8 = Longest Line In List -ListData1_0 = Apples -ListData1_1 = Oranges -ListData1_2 = Bananas -ListData1_3 = Grapefruit -ListData1_4 = Peaches -ListData1_5 = Kiwi -ListData1_6 = Apricots -ListData1_7 = Strawberries -ListData1_8 = The Longest String -DropDownData_0 = Apples -DropDownData_1 = Oranges -DropDownData_2 = -DropDownData_3 = Grapefruit -DropDownData_4 = Peaches -DropDownData_5 = Kiwi -DropDownData_6 = -DropDownData_7 = Strawberries -DropDownData_8 = The Longest String -Colors = Colors and Font -Change = &Change... -Defaults = &Defaults -Foreground_Color = Foreground Color -Background_Color = Background Color -Font = Font -Item_Foreground_Color = Item 0 Foreground Color -Item_Background_Color = Item 0 Background Color -Item_Font = Item 0 Font -Cell_Foreground_Color = Item 0 Col 1 Foreground Color -Cell_Background_Color = Item 0 Col 1 Background Color -Cell_Font = Item 0 Col 1 Font -Wrap_Text = Jack and Jill went up the hill to fetch a pail of water, \ - Jack fell down and broke his crown and Jill came tumbling after! -Foreground_Style = Foreground -Background_Style = Background -StyledText_Styles = Text Styles -StyledText_Style_Instructions = Select text, then style. -Bold = Bold -Italic = Italic -Underline = Underline -Strikeout = Strikeout -Fill_X = Horizontal Fill -Fill_Y = Vertical Fill -Pack_Columns = Pack Columns -TabItem1_0 = Tab 0 -TabItem1_1 = Tab 1 -TabItem1_2 = Tab 2 -TabItem_content = TabItem Content -CTabItem1_0 = CTabItem 0 -CTabItem1_1 = CTabItem 1 -CTabItem1_2 = CTabItem 2 has a long name -CItem_Colors = CTabItem Colors -CTabItem_content = CTabItem Content -Set_Simple_Tabs = Simple Tabs -Set_Single_Tabs = Single Tab -Set_Min_Visible = Minimize -Set_Max_Visible = Maximize -Set_Unselected_Close_Visible = Close on Unselected Tabs -Set_Unselected_Image_Visible = Image on Unselected Tabs -Selection_Foreground_Color = Selection Foreground Color -Selection_Background_Color = Selection Background Color -Set_Image = Set Image -TableTree_column = Column -MenuItem_Cut = Cu&t Ctrl+X -MenuItem_Copy = &Copy Ctrl+C -MenuItem_Paste = &Paste Ctrl+V -MenuItem_SelectAll = Select &All Ctrl+A -Orientation = Orientation -Default = Default (Inherit) -Images = Images -Accelerators = Accelerators -Mnemonics = Mnemonics -SubMenu = Sub-Menu -SubSubMenu = Sub-Sub-Menu -1Radio = Radio1 -2Radio = Radio2 -1RadioWithMnemonic = Radio&1 -2RadioWithMnemonic = Radio&2 -PushWithMnemonic = &Push -RadioWithMnemonic = &Radio -CheckWithMnemonic = &Check -CascadeWithMnemonic = C&ascade -PopupMenuHere = Popup Menu Here -LinkText=Visit the <A HREF=\"www.eclipse.org\">Eclipse.org</A> project and the <A HREF=\"www.eclipse.org/swt\">SWT</A> homepage. -Tooltip = Tooltip: {0} -Item1_Text = "What is your favorite button?" -Item2_Text = "What is your favorite icon?" -Popup_Menu = Popup Menu -No_Icon = No Icon -Caret = Caret -Image = Image -Resizeable_Columns = Resizeable Columns -AutoHide = autohide -Show_In_Tray = Show in Tray -ToolTip_Title = ToolTip Title
--- a/dwtexamples/helloworld/helloworld.properties Fri Apr 11 17:45:55 2008 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,11 +0,0 @@ -############################################################################### -# Copyright (c) 2000, 2003 IBM Corporation and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 -# which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html -# -# Contributors: -# IBM Corporation - initial API and implementation -############################################################################### -Hello_world = Hello World \ No newline at end of file
--- a/dwtexamples/texteditor/Images.d Fri Apr 11 17:45:55 2008 +0200 +++ b/dwtexamples/texteditor/Images.d Fri Apr 11 21:15:36 2008 +0200 @@ -33,9 +33,9 @@ public Image Green; public Image Blue; public Image Erase; - + Image[] AllBitmaps; - + this () { } @@ -44,10 +44,10 @@ AllBitmaps = null; } - Image createBitmapImage(Display display, void[] iImage, void[] iMask) { + Image createBitmapImage(Display display, void[] iImage, void[] iMask) { InputStream sourceStream = new ByteArrayInputStream(cast(byte[]) iImage); - InputStream maskStream = new ByteArrayInputStream(cast(byte[])iMask ); - + InputStream maskStream = new ByteArrayInputStream(cast(byte[])iMask ); + ImageData source = new ImageData (sourceStream); ImageData mask = new ImageData (maskStream); Image result = new Image (null, source, mask); @@ -59,18 +59,18 @@ } return result; } - + public void loadAll (Display display) { // Bitmap Images - Bold = createBitmapImage (display, import( "bold.bmp" ), import( "bold_mask.bmp" )); - Italic = createBitmapImage (display, import( "italic.bmp" ), import( "italic_mask.bmp" )); - Underline = createBitmapImage (display, import( "underline.bmp" ), import( "underline_mask.bmp" )); - Strikeout = createBitmapImage (display, import( "strikeout.bmp" ), import( "strikeout_mask.bmp" )); - Red = createBitmapImage (display, import( "red.bmp" ), import( "red_mask.bmp" )); - Green = createBitmapImage (display, import( "green.bmp" ), import( "green_mask.bmp" )); - Blue = createBitmapImage (display, import( "blue.bmp" ), import( "blue_mask.bmp" )); - Erase = createBitmapImage (display, import( "erase.bmp" ), import( "erase_mask.bmp" )); - + Bold = createBitmapImage (display, import( "dwtexamples.texteditor.bold.bmp" ), import( "dwtexamples.texteditor.bold_mask.bmp" )); + Italic = createBitmapImage (display, import( "dwtexamples.texteditor.italic.bmp" ), import( "dwtexamples.texteditor.italic_mask.bmp" )); + Underline = createBitmapImage (display, import( "dwtexamples.texteditor.underline.bmp" ), import( "dwtexamples.texteditor.underline_mask.bmp" )); + Strikeout = createBitmapImage (display, import( "dwtexamples.texteditor.strikeout.bmp" ), import( "dwtexamples.texteditor.strikeout_mask.bmp" )); + Red = createBitmapImage (display, import( "dwtexamples.texteditor.red.bmp" ), import( "dwtexamples.texteditor.red_mask.bmp" )); + Green = createBitmapImage (display, import( "dwtexamples.texteditor.green.bmp" ), import( "dwtexamples.texteditor.green_mask.bmp" )); + Blue = createBitmapImage (display, import( "dwtexamples.texteditor.blue.bmp" ), import( "dwtexamples.texteditor.blue_mask.bmp" )); + Erase = createBitmapImage (display, import( "dwtexamples.texteditor.erase.bmp" ), import( "dwtexamples.texteditor.erase_mask.bmp" )); + AllBitmaps = [ Bold, Italic, Underline,
--- a/dwtexamples/texteditor/TextEditor.d Fri Apr 11 17:45:55 2008 +0200 +++ b/dwtexamples/texteditor/TextEditor.d Fri Apr 11 21:15:36 2008 +0200 @@ -65,7 +65,7 @@ //string resources static ResourceBundle resources; - private static const char[] resourceData = import( "examples_texteditor.properties" ); + private static const char[] resourceData = import( "dwtexamples.texteditor.examples_texteditor.properties" ); /* * static ctor
--- a/dwtexamples/texteditor/examples_texteditor.properties Fri Apr 11 17:45:55 2008 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,22 +0,0 @@ -############################################################################### -# Copyright (c) 2000, 2003 IBM Corporation and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 -# which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html -# -# Contributors: -# IBM Corporation - initial API and implementation -############################################################################### -Exit_menuitem=E&xit -Cut_menuitem=Cu&t\tCtrl+X -Copy_menuitem=&Copy\tCtrl+C -Paste_menuitem=&Paste\tCtrl+V -Window_title=SWT Text Editor -Font_menuitem=Set &Font... -Edit_menuitem=&Edit -File_menuitem=&File -Bold=Bold -Italic=Italic -Underline=Underline -Strikeout=Strikeout \ No newline at end of file
--- a/jface/FileTreeViewer.d Fri Apr 11 17:45:55 2008 +0200 +++ b/jface/FileTreeViewer.d Fri Apr 11 21:15:36 2008 +0200 @@ -102,16 +102,11 @@ class FileTreeContentProvider : ITreeContentProvider { public override Object[] getChildren( Object arg0 ){ try{ - auto fp = cast(FilePath)arg0; - Object[] res; - if( !fp.isFolder()) { - return null; - } - foreach( item; fp ){ - res ~= FilePath.from( item ); - } - - return res; + Object[] res; + foreach( item; cast(FilePath)arg0 ){ + res ~= FilePath.from( item ); + } + return res; } catch( Exception e ){ ExceptionPrintStackTrace(e);
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/res/dwtexamples.addressbook.addressbook.properties Fri Apr 11 21:15:36 2008 +0200 @@ -0,0 +1,69 @@ +############################################################################### +# Copyright (c) 2000, 2003 IBM Corporation and others. +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Eclipse Public License v1.0 +# which accompanies this distribution, and is available at +# http://www.eclipse.org/legal/epl-v10.html +# +# Contributors: +# IBM Corporation - initial API and implementation +############################################################################### +Last_name = Last Name +First_name = First Name +Business_phone = Business Phone +Home_phone = Home Phone +Email = Email +Fax = Fax +Close_save = The address book contents have changed.\nDo you want to save the changes? +New_title = Untitled +Column = Column: +Book_extension = .adr +Book_filter_name = Address Books +All_filter_name = All Files +File = File +Does_not_exist = does not exist. +File_not_found = File not found: +IO_error_read = IO error reading text file: +IO_error_write = IO error writing text file: +IO_error_close = IO error closing text file: +Title_bar = Address Book - +Save_as_title = Save As +Query_overwrite = already exists.\nDo you want to replace it? +File_menu_title = &File +New_contact = &New Contact...\tCtrl+N +Edit_contact = &Edit Contact...\tCtrl+E +New_address_book = New Address &Book\tCtrl+B +Open_address_book = &Open Address Book...\tCtrl+O +Save_address_book = &Save Address Book\tCtrl+S +Save_book_as = Save &Address Book As...\tCtrl+A +Exit = E&xit +Edit_menu_title = &Edit +Edit = &Edit...\tCtrl+E +Copy = &Copy\tCtrl+C +Paste = &Paste\tCtrl+V +Delete = De&lete\tDel +Sort = &Sort +Search_menu_title = &Search +Find = &Find...\tCtrl+F +Find_next = Find &Next...\tF3 +Pop_up_new = &New... +Pop_up_edit = &Edit... +Pop_up_copy = &Copy +Pop_up_paste = &Paste +Pop_up_delete = &Delete +Pop_up_find = &Find... +Help_menu_title = &Help +About = &About Address Book... +About_1 = About +About_2 = \nversion 1.0 +OK = OK +Cancel = Cancel +Search_dialog_title = Find +Dialog_find_what = Fi&nd what: +Dialog_match_case = Match &case +Dialog_match_word = Match &whole word +Dialog_direction = Direction +Dialog_dir_up = &Up +Dialog_dir_down = &Down +Dialog_find = &Find +Cannot_find = Cannot find \ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/res/dwtexamples.controlexample.controlexample.properties Fri Apr 11 21:15:36 2008 +0200 @@ -0,0 +1,255 @@ +############################################################################### +# Copyright (c) 2000, 2005 IBM Corporation and others. +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Eclipse Public License v1.0 +# which accompanies this distribution, and is available at +# http://www.eclipse.org/legal/epl-v10.html +# +# Contributors: +# IBM Corporation - initial API and implementation +############################################################################### +error.CouldNotLoadResources = Unable to load resources +window.title = SWT Controls +custom.window.title = SWT Custom Controls + +Text_Buttons = Text Buttons +Size = Size +Alignment = Alignment +Left = Left +Right = Right +Up = Up +Down = Down +Center = Center +One = One +Two = Two +Three = Three +Image_Buttons = Image Buttons +Image_Text_Buttons = Image and Text Buttons +Control_Example = Control Example +Parameters = Parameters +Other = Other +Enabled = Enabled +Visible = Visible +BackgroundImage = Background Image +Preferred = Preferred +Styles = Styles +Menu_Styles = Menu Styles +MenuItem_Styles = MenuItem Styles +Background_Mode = Background Mode on Parent +Listeners = Listeners +Select_Listeners = Select Listeners +Listen = Listen +Clear = Clear +Set_Get = Set/Get API +Parameter_Info = {0} e.g. {1} +Info_int = 4 +Info_intA = 0,1,2 +Info_long = 4 +Info_longA = 0,1,2 +Info_char = c +Info_charA = a,b,c +Info_boolean = true +Info_booleanA = true,true,false +Info_String = hello +Info_StringA = hello,there +Info_Point = 0,0 +Info_TabItem = Tab 0 +Info_TabItemA = Tab 0,Tab 2 +Info_TableItem = Index:2 +Info_TableItemA = Index:2,Index:4 +Info_TreeItem = Node 1 +Info_TreeItemA = Node 1,Node 3 +Select_All = Select All +Deselect_All = Deselect All +OK = OK +FillDamage = Fill Damaged Area With Color +Title_Text = Title Text +Text_Labels = Text Labels +Image_Labels = Image Labels +Custom_Labels = Custom Labels +Custom_Combo = Custom Combo +One_Two_Three = One Two Three +Text_ToolBar = Text ToolBar +Image_ToolBar = Image ToolBar +ImageText_ToolBar = Image and Text ToolBar +Maximum = Maximum +Minimum = Minimum +Selection = Selection +Increment = Increment +Page_Increment = Page Increment +Thumb = Thumb +Digits = Digits +Tree_With_Images = Tree With Images +Dialog_Type = Dialog Type +Create_Dialog = Create Dialog +Button_Styles = Button Styles +Icon_Styles = Icon Styles +Modal_Styles = Modal Styles +File_Dialog_Styles = File Dialog Styles +Item_Styles = Item Styles +Dialog_Result = Dialog Result +ColorDialog = ColorDialog +DirectoryDialog = DirectoryDialog +FileDialog = FileDialog +FontDialog = FontDialog +PrintDialog = PrintDialog +MessageBox = MessageBox +Multi_line = A multi line text widget. +Example_string = The quick brown fox jumps over the lazy dog. +Header_Visible = Header Visible +Sort_Indicator = Sort Indicator +Header_Images = Header Images +Sub_Images = Sub Images +Lines_Visible = Lines Visible +Moveable_Columns = Moveable Columns +Multiple_Columns = Multiple Columns +Locked = Locked +Combo_child = Combo Child +Node_1 = Node 1 +Node_2 = Node 2 +Node_3 = Node 3 +Node_4 = Node 4 +Node_1_1 = Node 1.1 +Node_2_1 = Node 2.1 +Node_3_1 = Node 3.1 +Node_2_2 = Node 2.2 +Node_2_2_1 = Node 2.2.1 +Parent = Parent +No_Parent = No Parent +Decoration_Styles = Decoration Styles +Create_Shell = Create Shell +Close_All_Shells = Close All Shells +Push = Push +Radio = Radio +Check = Check +Cascade = Cascade +Drop_Down = Drop Down +Images_failed = Warning: Failed to load images +readme_txt = readme.txt +Index = Index: +Title = Title: +Close = Close +Result = Result: {0} +FilterName_0 = Text Files +FilterName_1 = Batch Files +FilterName_2 = Doc Files +FilterName_3 = All Files +TableTitle_0 = Name +TableTitle_1 = Type +TableTitle_2 = Size +TableTitle_3 = Modified +TableLine0_0 = <empty> +TableLine0_1 = classes +TableLine0_2 = 0 +TableLine0_3 = today +TableLine1_0 = <empty> +TableLine1_1 = databases +TableLine1_2 = 2556 +TableLine1_3 = tomorrow +TableLine2_0 = <empty> +TableLine2_1 = images +TableLine2_2 = 91571 +TableLine2_3 = yesterday +ListData0_0 = Line 1 +ListData0_1 = Line 2 +ListData0_2 = Line 3 +ListData0_3 = Line 4 +ListData0_4 = Line 5 +ListData0_5 = Line 6 +ListData0_6 = Line 7 +ListData0_7 = Line 8 +ListData0_8 = Longest Line In List +ListData1_0 = Apples +ListData1_1 = Oranges +ListData1_2 = Bananas +ListData1_3 = Grapefruit +ListData1_4 = Peaches +ListData1_5 = Kiwi +ListData1_6 = Apricots +ListData1_7 = Strawberries +ListData1_8 = The Longest String +DropDownData_0 = Apples +DropDownData_1 = Oranges +DropDownData_2 = +DropDownData_3 = Grapefruit +DropDownData_4 = Peaches +DropDownData_5 = Kiwi +DropDownData_6 = +DropDownData_7 = Strawberries +DropDownData_8 = The Longest String +Colors = Colors and Font +Change = &Change... +Defaults = &Defaults +Foreground_Color = Foreground Color +Background_Color = Background Color +Font = Font +Item_Foreground_Color = Item 0 Foreground Color +Item_Background_Color = Item 0 Background Color +Item_Font = Item 0 Font +Cell_Foreground_Color = Item 0 Col 1 Foreground Color +Cell_Background_Color = Item 0 Col 1 Background Color +Cell_Font = Item 0 Col 1 Font +Wrap_Text = Jack and Jill went up the hill to fetch a pail of water, \ + Jack fell down and broke his crown and Jill came tumbling after! +Foreground_Style = Foreground +Background_Style = Background +StyledText_Styles = Text Styles +StyledText_Style_Instructions = Select text, then style. +Bold = Bold +Italic = Italic +Underline = Underline +Strikeout = Strikeout +Fill_X = Horizontal Fill +Fill_Y = Vertical Fill +Pack_Columns = Pack Columns +TabItem1_0 = Tab 0 +TabItem1_1 = Tab 1 +TabItem1_2 = Tab 2 +TabItem_content = TabItem Content +CTabItem1_0 = CTabItem 0 +CTabItem1_1 = CTabItem 1 +CTabItem1_2 = CTabItem 2 has a long name +CItem_Colors = CTabItem Colors +CTabItem_content = CTabItem Content +Set_Simple_Tabs = Simple Tabs +Set_Single_Tabs = Single Tab +Set_Min_Visible = Minimize +Set_Max_Visible = Maximize +Set_Unselected_Close_Visible = Close on Unselected Tabs +Set_Unselected_Image_Visible = Image on Unselected Tabs +Selection_Foreground_Color = Selection Foreground Color +Selection_Background_Color = Selection Background Color +Set_Image = Set Image +TableTree_column = Column +MenuItem_Cut = Cu&t Ctrl+X +MenuItem_Copy = &Copy Ctrl+C +MenuItem_Paste = &Paste Ctrl+V +MenuItem_SelectAll = Select &All Ctrl+A +Orientation = Orientation +Default = Default (Inherit) +Images = Images +Accelerators = Accelerators +Mnemonics = Mnemonics +SubMenu = Sub-Menu +SubSubMenu = Sub-Sub-Menu +1Radio = Radio1 +2Radio = Radio2 +1RadioWithMnemonic = Radio&1 +2RadioWithMnemonic = Radio&2 +PushWithMnemonic = &Push +RadioWithMnemonic = &Radio +CheckWithMnemonic = &Check +CascadeWithMnemonic = C&ascade +PopupMenuHere = Popup Menu Here +LinkText=Visit the <A HREF=\"www.eclipse.org\">Eclipse.org</A> project and the <A HREF=\"www.eclipse.org/swt\">SWT</A> homepage. +Tooltip = Tooltip: {0} +Item1_Text = "What is your favorite button?" +Item2_Text = "What is your favorite icon?" +Popup_Menu = Popup Menu +No_Icon = No Icon +Caret = Caret +Image = Image +Resizeable_Columns = Resizeable Columns +AutoHide = autohide +Show_In_Tray = Show in Tray +ToolTip_Title = ToolTip Title
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/res/dwtexamples.helloworld.helloworld.properties Fri Apr 11 21:15:36 2008 +0200 @@ -0,0 +1,11 @@ +############################################################################### +# Copyright (c) 2000, 2003 IBM Corporation and others. +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Eclipse Public License v1.0 +# which accompanies this distribution, and is available at +# http://www.eclipse.org/legal/epl-v10.html +# +# Contributors: +# IBM Corporation - initial API and implementation +############################################################################### +Hello_world = Hello World \ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/res/dwtexamples.texteditor.examples_texteditor.properties Fri Apr 11 21:15:36 2008 +0200 @@ -0,0 +1,22 @@ +############################################################################### +# Copyright (c) 2000, 2003 IBM Corporation and others. +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Eclipse Public License v1.0 +# which accompanies this distribution, and is available at +# http://www.eclipse.org/legal/epl-v10.html +# +# Contributors: +# IBM Corporation - initial API and implementation +############################################################################### +Exit_menuitem=E&xit +Cut_menuitem=Cu&t\tCtrl+X +Copy_menuitem=&Copy\tCtrl+C +Paste_menuitem=&Paste\tCtrl+V +Window_title=SWT Text Editor +Font_menuitem=Set &Font... +Edit_menuitem=&Edit +File_menuitem=&File +Bold=Bold +Italic=Italic +Underline=Underline +Strikeout=Strikeout \ No newline at end of file