Rough GTK3 port

1 files changed, 150 insertions, 90 deletions

diff --git a/UMounterPrefs.pas b/UMounterPrefs.pas
index 7194370..fa81abe 100644
--- a/UMounterPrefs.pas
+++ b/UMounterPrefs.pas
@@ -22,9 +22,9 @@ unit UMounterPrefs;
 interface
 
 uses
-  lazglib2, lazgobject2,  gdk2, gtk2, SysUtils, Classes, Variants, GTKControls, GTKForms, GTKStdCtrls, GTKExtCtrls,
-  GTKView, GTKDialogs, GTKPixbuf, GTKMenus,
-  UCoreClasses, UGnome;
+  SysUtils, Classes, lazglib2, lazgobject2, lazgdk3, lazgtk3, GTKControls, GTKForms, GTKStdCtrls, GTKExtCtrls,
+  GTKView, GTKDialogs, GTKPixbuf,
+  UGnome;
 
 type
   TFMounterPrefs = class(TGTKDialog)
@@ -36,16 +36,15 @@ type
     ListView: TGTKListView;
     ListViewScrolledWindow: TGTKScrolledWindow;
     ListViewFrame, PropertiesFrame: TGTKFrame;
-    MounterListTable, PropertiesTable: TGTKTable;
+    MounterListGrid, PropertiesGrid: TGTKGrid;
     AddItemButton, RemoveItemButton: TGTKButton;
-    MoveUpButton, MoveDownButton: TGTKImageButton;
+    MoveUpButton, MoveDownButton: TGTKButton;
     HBox1: TGTKHBox;
     DisplayTextLabel, MountPointLabel, MountDeviceLabel, MountCommandLabel, UmountCommandLabel, IconLabel, DeviceTypeLabel: TGTKLabel;
     DisplayTextEntry, MountPointEntry, MountDeviceEntry, MountCommandEntry, UmountCommandEntry: TGTKEntry;
     IconEntry: TGnomeIconEntry;
     IconEntry2: TGTKButton;
-    DeviceTypeOptionMenu: TGTKOptionMenu;
-    miLocalDisk, miRemovable, miCD, miFloppy, miNetwork: TGTKMenuItem;
+    DeviceTypeComboBox: TGTKComboBoxText;
     UseFSTabDefaultsCheckBox: TGTKCheckButton;
     ToggleModeCheckBox: TGTKCheckButton;
     procedure FormCreate(Sender: TObject); override;
@@ -60,7 +59,7 @@ type
     procedure MountDeviceEntryChanged(Sender: TObject);
     procedure MountCommandEntryChanged(Sender: TObject);
     procedure UmountCommandEntryChanged(Sender: TObject);
-    procedure DeviceTypeOptionMenuChanged(Sender: TObject);
+    procedure DeviceTypeComboBoxChanged(Sender: TObject);
     procedure IconEntryChanged(Sender: TObject);
     procedure IconEntry2Click(Sender: TObject);
   private
@@ -83,27 +82,28 @@ uses ULocale, UFileAssoc, UCoreUtils, UConfig, UCore;
 function TGTKListView_drag_end(widget: PGtkWidget; drag_context: PGdkDragContext; user_data: gpointer): gboolean; cdecl; forward;
 
 procedure TFMounterPrefs.FormCreate(Sender: TObject);
-const row_targets: TGtkTargetEntry = (target:'GTK_TREE_MODEL_ROW'; flags:GTK_TARGET_SAME_APP; info:100);
+const row_targets: TGtkTargetEntry = (target:'GTK_TREE_MODEL_ROW'; flags:guint(GTK_TARGET_SAME_APP); info:100);
 var Column: TGTKTreeViewColumn;
+    VBox: TGTKVBox;
 begin
-  FUseGnomeIconEntry := Assigned(gnome_icon_entry_new) and Assigned(gnome_icon_entry_get_filename) and Assigned(gnome_icon_entry_set_filename);
-//  FUseGnomeIconEntry := False;
+  FUseGnomeIconEntry := False;
   SetDefaultSize(500, 520);
   Caption := LANGMounterPrefs_Caption;
   Buttons := [mbOK, mbCancel];
-  ShowSeparator := False;
   TitleEventBox := TGTKEventBox.Create(Self);
   TitleLabel := TGTKLabel.Create(Self);
   TitleLabel.Caption := Format('<span size="x-large" weight="ultrabold">%s</span>', [LANGMounterPrefs_TitleLabelCaption]); 
   TitleLabel.UseMarkup := True;
   TitleLabel.XAlign := 0;
-  TitleLabel.XPadding := 0;
-  TitleLabel.YPadding := 3;
+  TitleLabel.MarginStart := 0;
+  TitleLabel.MarginEnd := 0;
+  TitleLabel.MarginTop := 3;
+  TitleLabel.MarginBottom := 3;
   TitleEventBox.ControlState := csPrelight;
   TitleFrame := TGTKFrame.CreateWithoutLabel(Self);
   TitleFrame.ShadowType := stShadowOut;
   TitleIcon := TGTKImage.Create(Self);
-  TitleIcon.SetFromStock('gtk-cdrom', isLargeToolbar);
+  TitleIcon.SetFromIconName('gtk-cdrom', isLargeToolbar);
   TitleHBox := TGTKHBox.Create(Self);
   TitleHBox.Homogeneous := False;
   TitleHBox.AddControlEx(TGTKEventBox.Create(Self), False, False, 5);
@@ -117,14 +117,14 @@ begin
   ListViewFrame.Caption := LANGMounterPrefs_ListViewFrameCaption;
   ListViewFrame.BorderWidth := 7;
   ClientArea.AddControlEx(ListViewFrame, True, True, 0);
-  MounterListTable := TGTKTable.Create(Self);
-  ListViewFrame.AddControl(MounterListTable);
-  MounterListTable.BorderWidth := 7;
+  MounterListGrid := TGTKGrid.Create(Self);
+  ListViewFrame.AddControl(MounterListGrid);
+  MounterListGrid.BorderWidth := 7;
 
   ListView := TGTKListView.CreateTyped(Self, False, [lcText, lcText, lcText, lcPointer, lcPixbuf]);
   g_signal_connect_data(PGObject(ListView.FWidget), 'drag-end', TGCallback(@TGTKListView_drag_end), nil, nil, G_CONNECT_DEFAULT);
-  gtk_tree_view_enable_model_drag_source(GTK_TREE_VIEW(ListView.FWidget), GDK_BUTTON1_MASK, @row_targets, 1, GDK_ACTION_MOVE or GDK_ACTION_COPY);
-  gtk_tree_view_enable_model_drag_dest(GTK_TREE_VIEW(ListView.FWidget), @row_targets, 1, GDK_ACTION_MOVE or GDK_ACTION_COPY);
+  gtk_tree_view_enable_model_drag_source(PGtkTreeView(ListView.FWidget), [GDK_BUTTON1_MASK], @row_targets, 1, [GDK_ACTION_MOVE, GDK_ACTION_COPY]);
+  gtk_tree_view_enable_model_drag_dest(PGtkTreeView(ListView.FWidget), @row_targets, 1, [GDK_ACTION_MOVE, GDK_ACTION_COPY]);
   ListView.RulesHint := True;
 //  ListView.Reorderable := True;
   Column := ListView.Columns.AddTyped(ctImageText);
@@ -154,128 +154,189 @@ begin
   ListViewScrolledWindow.HorizScrollBarPolicy := sbAutomatic;
   ListViewScrolledWindow.VertScrollBarPolicy := sbAutomatic;
   ListViewScrolledWindow.ShadowType := stShadowIn;
+  ListViewScrolledWindow.MarginTop := 5;
+  ListViewScrolledWindow.MarginBottom := 5;
 
-  AddItemButton := TGTKButton.CreateFromStock(Self, 'gtk-add');
-  RemoveItemButton := TGTKButton.CreateFromStock(Self, 'gtk-remove');
+  AddItemButton := TGTKButton.CreateFromIconName(Self, 'gtk-add');
+  AddItemButton.Caption := 'Add';
+  RemoveItemButton := TGTKButton.CreateFromIconName(Self, 'gtk-remove');
+  RemoveItemButton.Caption := 'Remove';
   HBox1 := TGTKHBox.Create(Self);
   HBox1.Homogeneous := True;
   HBox1.AddControlEx(AddItemButton, True, True, 2);
   HBox1.AddControlEx(RemoveItemButton, True, True, 2);
-  MoveUpButton := TGTKImageButton.CreateWithoutLabel(Self);
-  MoveUpButton.SetFromStock('gtk-go-up', isSmallToolbar);
+  HBox1.MarginTop := 2;
+  HBox1.MarginBottom := 2;
+  MoveUpButton := TGTKButton.CreateFromIconName(Self, 'gtk-go-up');
   MoveUpButton.Tooltip := LANGMounterPrefs_MoveUpButtonTooltip;
   MoveUpButton.CanFocus := False;
-  MoveDownButton := TGTKImageButton.CreateWithoutLabel(Self);
-  MoveDownButton.SetFromStock('gtk-go-down', isSmallToolbar);
+  MoveUpButton.MarginStart := 5;
+  MoveUpButton.MarginEnd := 5;
+  MoveUpButton.MarginTop := 5;
+  MoveUpButton.MarginBottom := 5;
+  MoveDownButton := TGTKButton.CreateFromIconName(Self, 'gtk-go-down');
   MoveDownButton.Tooltip := LANGMounterPrefs_MoveDownButtonTooltip;
   MoveDownButton.CanFocus := False;
+  MoveDownButton.MarginStart := 5;
+  MoveDownButton.MarginEnd := 5;
+  MoveDownButton.MarginTop := 5;
+  MoveDownButton.MarginBottom := 5;
 
   UseFSTabDefaultsCheckBox := TGTKCheckButton.CreateWithLabel(Self, LANGMounterPrefs_UseFSTabDefaultsCheckBox);
   UseFSTabDefaultsCheckBox.Tooltip := LANGMounterPrefs_UseFSTabDefaultsCheckBoxTooltip;
+  UseFSTabDefaultsCheckBox.MarginTop := 2;
+  UseFSTabDefaultsCheckBox.MarginBottom := 2;
   ToggleModeCheckBox := TGTKCheckButton.CreateWithLabel(Self, LANGMounterPrefs_ToggleModeCheckBox);
   ToggleModeCheckBox.Tooltip := LANGMounterPrefs_ToggleModeCheckBoxTooltip;
-
-  MounterListTable.AddControlEx(0, 0, 3, 1, UseFSTabDefaultsCheckBox, [taoExpand, taoFill], [taoShrink, taoFill], 0, 2);
-  MounterListTable.AddControlEx(0, 1, 3, 1, ToggleModeCheckBox, [taoExpand, taoFill], [taoShrink, taoFill], 0, 2);
-  MounterListTable.AddControlEx(0, 2, 3, 4, ListViewScrolledWindow, [taoExpand, taoFill], [taoExpand, taoFill], 0, 5);
-  MounterListTable.AddControlEx(0, 6, 1, 1, TGTKLabel.Create(Self), [taoExpand, taoFill], [taoShrink, taoFill], 0, 2);
-  MounterListTable.AddControlEx(2, 6, 1, 1, HBox1, [taoShrink, taoFill], [taoShrink, taoFill], 0, 2);
-  MounterListTable.AddControlEx(3, 3, 1, 1, MoveUpButton, [taoShrink, taoFill], [taoShrink], 5, 5);
-  MounterListTable.AddControlEx(3, 4, 1, 1, MoveDownButton, [taoShrink, taoFill], [taoShrink], 5, 5);
-  MounterListTable.AddControlEx(3, 2, 1, 1, TGTKLabel.Create(Self), [taoShrink, taoFill], [taoExpand, taoFill], 0, 2);
-  MounterListTable.AddControlEx(3, 5, 1, 1, TGTKLabel.Create(Self), [taoShrink, taoFill], [taoExpand, taoFill], 0, 2);
+  ToggleModeCheckBox.MarginTop := 2;
+  ToggleModeCheckBox.MarginBottom := 2;
+
+  MounterListGrid.AddControl(0, 0, 3, 1, UseFSTabDefaultsCheckBox);
+  MounterListGrid.AddControl(0, 1, 3, 1, ToggleModeCheckBox);
+  MounterListGrid.AddControl(0, 2, 3, 4, ListViewScrolledWindow);
+  VBox := TGTKVBox.Create(Self);
+  VBox.MarginTop := 2;
+  VBox.MarginBottom := 2;
+  MounterListGrid.AddControl(0, 6, 1, 1, VBox);
+  MounterListGrid.AddControl(2, 6, 1, 1, HBox1);
+  MounterListGrid.AddControl(3, 3, 1, 1, MoveUpButton);
+  MounterListGrid.AddControl(3, 4, 1, 1, MoveDownButton);
+  VBox := TGTKVBox.Create(Self);
+  VBox.MarginTop := 2;
+  VBox.MarginBottom := 2;
+  MounterListGrid.AddControl(3, 2, 1, 1, VBox);
+  VBox := TGTKVBox.Create(Self);
+  VBox.MarginTop := 2;
+  VBox.MarginBottom := 2;
+  MounterListGrid.AddControl(3, 5, 1, 1, VBox);
 
   PropertiesFrame := TGTKFrame.Create(Self);
   PropertiesFrame.Caption := LANGMounterPrefs_PropertiesFrameCaption;
   PropertiesFrame.BorderWidth := 7;
-  PropertiesTable := TGTKTable.Create(Self);
-  PropertiesFrame.AddControl(PropertiesTable);
+  PropertiesGrid := TGTKGrid.Create(Self);
+  PropertiesFrame.AddControl(PropertiesGrid);
   ClientArea.AddControlEx(PropertiesFrame, False, False, 0);
   DisplayTextLabel := TGTKLabel.Create(Self);
   DisplayTextLabel.Caption := LANGMounterPrefs_DisplayTextLabelCaption;
-  DisplayTextLabel.XAlign := 0;
   DisplayTextLabel.UseUnderline := True;
+  DisplayTextLabel.XAlign := 0;
+  DisplayTextLabel.MarginStart := 10;
+  DisplayTextLabel.MarginEnd := 10;
+  DisplayTextLabel.MarginTop := 2;
+  DisplayTextLabel.MarginBottom := 2;
   MountPointLabel := TGTKLabel.Create(Self);
   MountPointLabel.Caption := LANGMounterPrefs_MountPointLabelCaption;
-  MountPointLabel.XAlign := 0;
   MountPointLabel.UseUnderline := True;
+  MountPointLabel.XAlign := 0;
+  MountPointLabel.MarginStart := 10;
+  MountPointLabel.MarginEnd := 10;
+  MountPointLabel.MarginTop := 2;
+  MountPointLabel.MarginBottom := 2;
   MountDeviceLabel := TGTKLabel.Create(Self);
   MountDeviceLabel.Caption := LANGMounterPrefs_MountDeviceLabelCaption;
-  MountDeviceLabel.XAlign := 0;
   MountDeviceLabel.UseUnderline := True;
+  MountDeviceLabel.XAlign := 0;
+  MountDeviceLabel.MarginStart := 10;
+  MountDeviceLabel.MarginEnd := 10;
+  MountDeviceLabel.MarginTop := 2;
+  MountDeviceLabel.MarginBottom := 2;
   DeviceTypeLabel := TGTKLabel.Create(Self);
   DeviceTypeLabel.Caption := LANGMounterPrefs_DeviceTypeLabelCaption;
-  DeviceTypeLabel.XAlign := 0;
   DeviceTypeLabel.UseUnderline := True;
+  DeviceTypeLabel.XAlign := 0;
+  DeviceTypeLabel.MarginTop := 2;
+  DeviceTypeLabel.MarginBottom := 2;
   DisplayTextEntry := TGTKEntry.Create(Self);
+  DisplayTextEntry.MarginStart := 10;
+  DisplayTextEntry.MarginEnd := 10;
+  DisplayTextEntry.MarginTop := 2;
+  DisplayTextEntry.MarginBottom := 2;
   DisplayTextLabel.FocusControl := DisplayTextEntry;
   MountPointEntry := TGTKEntry.Create(Self);
+  MountPointEntry.MarginStart := 10;
+  MountPointEntry.MarginEnd := 10;
+  MountPointEntry.MarginTop := 2;
+  MountPointEntry.MarginBottom := 2;
   MountPointLabel.FocusControl := MountPointEntry;
   MountDeviceEntry := TGTKEntry.Create(Self);
+  MountDeviceEntry.MarginStart := 10;
+  MountDeviceEntry.MarginEnd := 10;
+  MountDeviceEntry.MarginTop := 2;
+  MountDeviceEntry.MarginBottom := 2;
   MountDeviceLabel.FocusControl := MountDeviceEntry;
-  DeviceTypeOptionMenu := TGTKOptionMenu.Create(Self);
-  DeviceTypeLabel.FocusControl := DeviceTypeOptionMenu;
-  miLocalDisk := TGTKMenuItem.CreateTyped(Self, itImageText);
-  miLocalDisk.Caption := LANGMounterPrefs_miLocalDiskCaption;
-  miLocalDisk.Icon := MounterHDD;
-  miRemovable := TGTKMenuItem.CreateTyped(Self, itImageText);
-  miRemovable.Caption := LANGMounterPrefs_miRemovableCaption;
-  miRemovable.Icon := MounterRemovable;
-  miCD := TGTKMenuItem.CreateTyped(Self, itImageText);
-  miCD.Caption := LANGMounterPrefs_miCDCaption;
-  miCD.Icon := MounterCD;
-  miFloppy := TGTKMenuItem.CreateTyped(Self, itImageText);
-  miFloppy.Caption := LANGMounterPrefs_miFloppyCaption;
-  miFloppy.Icon := MounterFloppy;
-  miNetwork := TGTKMenuItem.CreateTyped(Self, itImageText);
-  miNetwork.Caption := LANGMounterPrefs_miNetworkCaption;
-  miNetwork.Icon := MounterNetwork;
-  DeviceTypeOptionMenu.Items.Add(miLocalDisk);
-  DeviceTypeOptionMenu.Items.Add(miRemovable);
-  DeviceTypeOptionMenu.Items.Add(miCD);
-  DeviceTypeOptionMenu.Items.Add(miFloppy);
-  DeviceTypeOptionMenu.Items.Add(miNetwork);
+  DeviceTypeComboBox := TGTKComboBoxText.Create(Self);
+  DeviceTypeLabel.FocusControl := DeviceTypeComboBox;
+  // TODO: icons
+  DeviceTypeComboBox.AppendItem(LANGMounterPrefs_miLocalDiskCaption);
+  DeviceTypeComboBox.AppendItem(LANGMounterPrefs_miRemovableCaption);
+  DeviceTypeComboBox.AppendItem(LANGMounterPrefs_miCDCaption);
+  DeviceTypeComboBox.AppendItem(LANGMounterPrefs_miFloppyCaption);
+  DeviceTypeComboBox.AppendItem(LANGMounterPrefs_miNetworkCaption);
+  DeviceTypeComboBox.MarginStart := 10;
+  DeviceTypeComboBox.MarginEnd := 10;
+  DeviceTypeComboBox.MarginTop := 2;
+  DeviceTypeComboBox.MarginBottom := 2;
 
   MountCommandLabel := TGTKLabel.Create(Self);
   MountCommandLabel.Caption := LANGMounterPrefs_MountCommandLabelCaption;
-  MountCommandLabel.XAlign := 0;
   MountCommandLabel.UseUnderline := True;
+  MountCommandLabel.XAlign := 0;
+  MountCommandLabel.MarginStart := 10;
+  MountCommandLabel.MarginEnd := 10;
+  MountCommandLabel.MarginTop := 2;
+  MountCommandLabel.MarginBottom := 2;
   UmountCommandLabel := TGTKLabel.Create(Self);
   UmountCommandLabel.Caption := LANGMounterPrefs_UmountCommandLabelCaption;
-  UmountCommandLabel.XAlign := 0;
   UmountCommandLabel.UseUnderline := True;
+  UmountCommandLabel.XAlign := 0;
+  UmountCommandLabel.MarginTop := 2;
+  UmountCommandLabel.MarginBottom := 2;
   MountCommandEntry := TGTKEntry.Create(Self);
   MountCommandEntry.Tooltip := LANGMounterPrefs_MountCommandEntryTooltip;
+  MountCommandEntry.MarginStart := 10;
+  MountCommandEntry.MarginEnd := 10;
+  MountCommandEntry.MarginTop := 2;
+  MountCommandEntry.MarginBottom := 2;
   MountCommandLabel.FocusControl := MountCommandEntry;
   UmountCommandEntry := TGTKEntry.Create(Self);
   UmountCommandEntry.Tooltip := LANGMounterPrefs_UmountCommandEntryTooltip;
+  UmountCommandEntry.MarginStart := 10;
+  UmountCommandEntry.MarginEnd := 10;
+  UmountCommandEntry.MarginTop := 2;
+  UmountCommandEntry.MarginBottom := 2;
   UmountCommandLabel.FocusControl := UmountCommandEntry;
-  PropertiesTable.AddControlEx(0, 0, 1, 1, DisplayTextLabel, [taoShrink, taoFill], [taoShrink, taoFill], 10, 2);
-  PropertiesTable.AddControlEx(1, 0, 2, 1, DisplayTextEntry, [taoExpand, taoFill], [taoShrink, taoFill], 10, 2);
-  PropertiesTable.AddControlEx(0, 1, 1, 1, MountPointLabel, [taoShrink, taoFill], [taoShrink, taoFill], 10, 2);
-  PropertiesTable.AddControlEx(1, 1, 2, 1, MountPointEntry, [taoExpand, taoFill], [taoShrink, taoFill], 10, 2);
-  PropertiesTable.AddControlEx(0, 2, 1, 1, MountDeviceLabel, [taoShrink, taoFill], [taoShrink, taoFill], 10, 2);
-  PropertiesTable.AddControlEx(1, 2, 1, 1, MountDeviceEntry, [taoExpand, taoFill], [taoShrink, taoFill], 10, 2);
-  PropertiesTable.AddControlEx(2, 2, 1, 1, DeviceTypeLabel, [taoShrink, taoFill], [taoShrink, taoFill], 0, 2);
-  PropertiesTable.AddControlEx(3, 2, 2, 1, DeviceTypeOptionMenu, [taoExpand, taoFill], [taoShrink, taoFill], 10, 2);
-  PropertiesTable.AddControlEx(0, 3, 1, 1, MountCommandLabel, [taoShrink, taoFill], [taoShrink, taoFill], 10, 2);
-  PropertiesTable.AddControlEx(1, 3, 1, 1, MountCommandEntry, [taoExpand, taoFill], [taoShrink, taoFill], 10, 2);
-  PropertiesTable.AddControlEx(2, 3, 1, 1, UmountCommandLabel, [taoShrink, taoFill], [taoShrink, taoFill], 0, 2);
-  PropertiesTable.AddControlEx(3, 3, 2, 1, UmountCommandEntry, [taoExpand, taoFill], [taoShrink, taoFill], 10, 2);
+  PropertiesGrid.AddControl(0, 0, 1, 1, DisplayTextLabel);
+  PropertiesGrid.AddControl(1, 0, 2, 1, DisplayTextEntry);
+  PropertiesGrid.AddControl(0, 1, 1, 1, MountPointLabel);
+  PropertiesGrid.AddControl(1, 1, 2, 1, MountPointEntry);
+  PropertiesGrid.AddControl(0, 2, 1, 1, MountDeviceLabel);
+  PropertiesGrid.AddControl(1, 2, 1, 1, MountDeviceEntry);
+  PropertiesGrid.AddControl(2, 2, 1, 1, DeviceTypeLabel);
+  PropertiesGrid.AddControl(3, 2, 2, 1, DeviceTypeComboBox);
+  PropertiesGrid.AddControl(0, 3, 1, 1, MountCommandLabel);
+  PropertiesGrid.AddControl(1, 3, 1, 1, MountCommandEntry);
+  PropertiesGrid.AddControl(2, 3, 1, 1, UmountCommandLabel);
+  PropertiesGrid.AddControl(3, 3, 2, 1, UmountCommandEntry);
 
   IconLabel := TGTKLabel.Create(Self);
   IconLabel.Caption := LANGMounterPrefs_IconLabelCaption;
   IconLabel.XAlign := 1;
+  IconLabel.MarginTop := 2;
+  IconLabel.MarginBottom := 2;
   IconLabel.UseUnderline := True;
-  PropertiesTable.AddControlEx(3, 0, 1, 2, IconLabel, [taoExpand, taoFill], [taoShrink, taoFill], 0, 2);
+  PropertiesGrid.AddControl(3, 0, 1, 2, IconLabel);
   if FUseGnomeIconEntry then begin
     IconEntry := TGnomeIconEntry.Create(Self);
     IconLabel.FocusControl := IconEntry;
-    PropertiesTable.AddControlEx(4, 0, 1, 2, IconEntry, [taoExpand, taoFill], [taoExpand, taoFill], 0, 0);
+    PropertiesGrid.AddControl(4, 0, 1, 2, IconEntry);
   end else begin
     IconEntry2 := TGTKButton.Create(Self);
     IconEntry2.Caption := LANGBrowseButton_Caption;
-    PropertiesTable.AddControlEx(4, 0, 1, 2, IconEntry2, [taoExpand, taoFill], [taoExpand, taoFill], 10, 4);
+    IconEntry2.MarginStart := 10;
+    IconEntry2.MarginEnd := 10;
+    IconEntry2.MarginTop := 4;
+    IconEntry2.MarginBottom := 4;
+    PropertiesGrid.AddControl(4, 0, 1, 2, IconEntry2);
   end;
 
 
@@ -292,7 +353,7 @@ begin
   MountDeviceEntry.OnChanged := @MountDeviceEntryChanged;
   MountCommandEntry.OnChanged := @MountCommandEntryChanged;
   UmountCommandEntry.OnChanged := @UmountCommandEntryChanged;
-  DeviceTypeOptionMenu.OnChanged := @DeviceTypeOptionMenuChanged;
+  DeviceTypeComboBox.OnChanged := @DeviceTypeComboBoxChanged;
   if FUseGnomeIconEntry then IconEntry.OnIconChanged := @IconEntryChanged
                         else IconEntry2.OnClick := @IconEntry2Click;
 
@@ -308,14 +369,14 @@ begin
   RemoveItemButton.Enabled := b;
   MoveUpButton.Enabled := b and (ListView.Selected.Index > 0);
   MoveDownButton.Enabled := b and (ListView.Selected.Index < ListView.Items.Count - 1);
-  PropertiesTable.Enabled := b;
+  PropertiesGrid.Enabled := b;
   if not b then begin
     DisplayTextEntry.Text := '';
     MountPointEntry.Text := '';
     MountDeviceEntry.Text := '';
     MountCommandEntry.Text := '';
     UmountCommandEntry.Text := '';
-    DeviceTypeOptionMenu.ItemIndex := 0;
+    DeviceTypeComboBox.ItemIndex := 0;
     if FUseGnomeIconEntry then IconEntry.Filename := '';
     Exit;
   end;
@@ -325,7 +386,7 @@ begin
   MountDeviceEntry.Text := StrToUTF8(Item.Device);
   MountCommandEntry.Text := StrToUTF8(Item.MountCommand);
   UmountCommandEntry.Text := StrToUTF8(Item.UmountCommand);
-  DeviceTypeOptionMenu.ItemIndex := Item.DeviceType;
+  DeviceTypeComboBox.ItemIndex := Item.DeviceType;
   if FUseGnomeIconEntry then IconEntry.Filename := Item.IconPath;
 end;
 
@@ -428,10 +489,10 @@ begin
   end;
 end;
 
-procedure TFMounterPrefs.DeviceTypeOptionMenuChanged(Sender: TObject);
+procedure TFMounterPrefs.DeviceTypeComboBoxChanged(Sender: TObject);
 begin
   if Assigned(ListView.Selected) and Assigned(ListView.Selected.AsPointer(3)) and (not UseFSTabDefaultsCheckBox.Checked) then begin
-    TMounterItem(ListView.Selected.AsPointer(3)).DeviceType := DeviceTypeOptionMenu.ItemIndex;
+    TMounterItem(ListView.Selected.AsPointer(3)).DeviceType := DeviceTypeComboBox.ItemIndex;
     RefreshIcon(ListView.Selected.Index);
   end;
 end;
@@ -470,12 +531,11 @@ begin
 end;
 
 procedure TFMounterPrefs.IconEntry2Click(Sender: TObject);
-var Dialog: TGTKFileSelectionDialog;
+var Dialog: TGTKFileChooserDialog;
 begin
   if (not Assigned(ListView.Selected)) or (not Assigned(ListView.Selected.AsPointer(3))) then Exit;
-  Dialog := TGTKFileSelectionDialog.CreateWithTitle(Self, LANGBrowseForIcon);
+  Dialog := TGTKFileChooserDialog.CreateWithTitle(Self, LANGBrowseForIcon);
   try
-    Dialog.ShowFileOpButtons := False;
     Dialog.FileName := TMounterItem(ListView.Selected.AsPointer(3)).IconPath;
     if Byte(Dialog.Run) = 251 then TMounterItem(ListView.Selected.AsPointer(3)).IconPath := Dialog.FileName;
     RefreshIcon(ListView.Selected.Index);