Rough GTK3 port

1 files changed, 32 insertions, 31 deletions

diff --git a/UFileAssoc.pas b/UFileAssoc.pas
index 60ee2d5..a2d9573 100644
--- a/UFileAssoc.pas
+++ b/UFileAssoc.pas
@@ -127,59 +127,59 @@ end;
 procedure LoadIcons;
 begin
   FolderIcon := TGDKPixbuf.Create(Application);
-  FolderIcon.LoadFromInline(@stock_folder_16_png[1]);
-  FolderIcon.ScaleSimple(ConfRowHeightReal, ConfRowHeightReal);
+//  FolderIcon.LoadFromInline(@stock_folder_16_png[1]);
+//  FolderIcon.ScaleSimple(ConfRowHeightReal, ConfRowHeightReal);
   FileIcon := TGDKPixbuf.Create(Application);
-  FileIcon.LoadFromInline(@stock_new_16_png[1]);
-  FileIcon.ScaleSimple(ConfRowHeightReal, ConfRowHeightReal);
+//  FileIcon.LoadFromInline(@stock_new_16_png[1]);
+//  FileIcon.ScaleSimple(ConfRowHeightReal, ConfRowHeightReal);
   UpDirIcon := TGDKPixbuf.Create(Application);
-  UpDirIcon.LoadFromInline(@stock_up_one_dir_16_png[1]);
-  UpDirIcon.ScaleSimple(ConfRowHeightReal, ConfRowHeightReal);
+//  UpDirIcon.LoadFromInline(@stock_up_one_dir_16_png[1]);
+//  UpDirIcon.ScaleSimple(ConfRowHeightReal, ConfRowHeightReal);
   SymLinkEmblem := TGDKPixbuf.Create(Application);
-  SymLinkEmblem.LoadFromInline(@emblem_symbolic_link_png[1]);
+//  SymLinkEmblem.LoadFromInline(@emblem_symbolic_link_png[1]);
   FolderIconLnk := TGDKPixbuf.Create(Application);
-  FolderIconLnk.FPixbuf := FolderIcon.Copy;
-  FolderIconLnk.CopyArea(SymLinkEmblem, 0, 0, SymLinkEmblem.Width, SymLinkEmblem.Height, FolderIconLnk.Width - SymLinkEmblem.Width, FolderIconLnk.Height - SymLinkEmblem.Height);
+//  FolderIconLnk.FPixbuf := FolderIcon.Copy;
+//  FolderIconLnk.CopyArea(SymLinkEmblem, 0, 0, SymLinkEmblem.Width, SymLinkEmblem.Height, FolderIconLnk.Width - SymLinkEmblem.Width, FolderIconLnk.Height - SymLinkEmblem.Height);
   FileIconLnk := TGDKPixbuf.Create(Application);
-  FileIconLnk.FPixbuf := FileIcon.Copy;
-  FileIconLnk.CopyArea(SymLinkEmblem, 0, 0, SymLinkEmblem.Width, SymLinkEmblem.Height, FileIconLnk.Width - SymLinkEmblem.Width, FileIconLnk.Height - SymLinkEmblem.Height);
+//  FileIconLnk.FPixbuf := FileIcon.Copy;
+//  FileIconLnk.CopyArea(SymLinkEmblem, 0, 0, SymLinkEmblem.Width, SymLinkEmblem.Height, FileIconLnk.Width - SymLinkEmblem.Width, FileIconLnk.Height - SymLinkEmblem.Height);
   FolderIconCached := FolderIcon;
   FileIconCached := FileIcon;
   FolderIconLnkCached := FolderIconLnk;
   FileIconLnkCached := FileIconLnk;
   MounterHDD := TGDKPixbuf.Create(Application);
-  MounterHDD.LoadFromInline(@gnome_dev_harddisk_16_png[1]);
+//  MounterHDD.LoadFromInline(@gnome_dev_harddisk_16_png[1]);
   MounterRemovable := TGDKPixbuf.Create(Application);
-  MounterRemovable.LoadFromInline(@gnome_dev_removable_usb_16_png[1]);
+//  MounterRemovable.LoadFromInline(@gnome_dev_removable_usb_16_png[1]);
   MounterFloppy := TGDKPixbuf.Create(Application);
-  MounterFloppy.LoadFromInline(@gnome_dev_floppy_16_png[1]);
+//  MounterFloppy.LoadFromInline(@gnome_dev_floppy_16_png[1]);
   MounterCD := TGDKPixbuf.Create(Application);
-  MounterCD.LoadFromInline(@gnome_dev_cdrom_16_png[1]);
+//  MounterCD.LoadFromInline(@gnome_dev_cdrom_16_png[1]);
   MounterNetwork := TGDKPixbuf.Create(Application);
-  MounterNetwork.LoadFromInline(@gnome_mime_x_directory_smb_share_16_png[1]);
+//  MounterNetwork.LoadFromInline(@gnome_mime_x_directory_smb_share_16_png[1]);
   StockLock16 := TGDKPixbuf.Create(Application);
-  StockLock16.LoadFromInline(@stock_lock_16_png[1]);
+//  StockLock16.LoadFromInline(@stock_lock_16_png[1]);
   StockLock48 := TGDKPixbuf.Create(Application);
-  StockLock48.LoadFromInline(@stock_lock_48_png[1]);
+//  StockLock48.LoadFromInline(@stock_lock_48_png[1]);
   ArchiveIcon := TGDKPixbuf.Create(Application);
-  ArchiveIcon.LoadFromInline(@gnome_mime_application_zip_16_png[1]);
-  ArchiveIcon.ScaleSimple(ConfRowHeightReal, ConfRowHeightReal);
+//  ArchiveIcon.LoadFromInline(@gnome_mime_application_zip_16_png[1]);
+//  ArchiveIcon.ScaleSimple(ConfRowHeightReal, ConfRowHeightReal);
   ArchiveIconLnk := TGDKPixbuf.Create(Application);
-  ArchiveIconLnk.FPixbuf := ArchiveIcon.Copy;
-  ArchiveIconLnk.CopyArea(SymLinkEmblem, 0, 0, SymLinkEmblem.Width, SymLinkEmblem.Height, FolderIconLnk.Width - SymLinkEmblem.Width, FolderIconLnk.Height - SymLinkEmblem.Height);
+//  ArchiveIconLnk.FPixbuf := ArchiveIcon.Copy;
+//  ArchiveIconLnk.CopyArea(SymLinkEmblem, 0, 0, SymLinkEmblem.Width, SymLinkEmblem.Height, FolderIconLnk.Width - SymLinkEmblem.Width, FolderIconLnk.Height - SymLinkEmblem.Height);
 
   AppIcon16 := TGDKPixbuf.Create(Application);
-  AppIcon16.LoadFromInline(@tuxcmd_16_png[1]);
+//  AppIcon16.LoadFromInline(@tuxcmd_16_png[1]);
   AppIcon24 := TGDKPixbuf.Create(Application);
-  AppIcon24.LoadFromInline(@tuxcmd_24_png[1]);
+//  AppIcon24.LoadFromInline(@tuxcmd_24_png[1]);
   AppIcon32 := TGDKPixbuf.Create(Application);
-  AppIcon32.LoadFromInline(@tuxcmd_32_png[1]);
+//  AppIcon32.LoadFromInline(@tuxcmd_32_png[1]);
   AppIcon48 := TGDKPixbuf.Create(Application);
-  AppIcon48.LoadFromInline(@tuxcmd_48_png[1]);
+//  AppIcon48.LoadFromInline(@tuxcmd_48_png[1]);
   AppIcon64 := TGDKPixbuf.Create(Application);
-  AppIcon64.LoadFromInline(@tuxcmd_64_png[1]);
+//  AppIcon64.LoadFromInline(@tuxcmd_64_png[1]);
   AppIcon128 := TGDKPixbuf.Create(Application);
-  AppIcon128.LoadFromInline(@tuxcmd_128_png[1]);
+//  AppIcon128.LoadFromInline(@tuxcmd_128_png[1]);
 end;
 
 (********************************************************************************************************************************)
@@ -274,11 +274,12 @@ begin
               then Icon := Assoc.LnkPixmap.FPixbuf
               else Icon := Assoc.Pixmap.FPixbuf;
           end;
-          if ItemColor = nil then begin
+          //  TODO
+{          if ItemColor = nil then begin
             if (Assoc.ColorString = '') or (not StringToGDKColor(Assoc.ColorString, AColor))
                 then ItemColor := NormalItemGDKColor
-                else ItemColor := GDKColorToPGdkColor(AColor);
-          end;
+                else ItemColor := GDKColorToPGdkColor(AColor); 
+          end; }
         end;
       end;
     end;