org.handhelds.familiar/packages/gpe-conf/gpe-conf-0.1.20/misc1.patch

   1 Index: main.c
   2 ===================================================================
   3 RCS file: /cvs/gpe/base/gpe-conf/main.c,v
   4 retrieving revision 1.70
   5 diff -u -r1.70 main.c
   6 --- main.c      16 Oct 2004 16:03:42 -0000      1.70
   7 +++ main.c      26 Oct 2004 14:52:24 -0000
   8 @@ -125,7 +125,9 @@
   9      { &Unimplemented_Build_Objects, &Unimplemented_Free_Objects, &Unimplemented_Save, &Unimplemented_Restore ,
  10                 "Task nameserver" ,"task_nameserver","Task for changing nameserver", PREFIX "/share/pixmaps/gpe-config-admin.png"},
  11      { &Unimplemented_Build_Objects, &Unimplemented_Free_Objects, &Unimplemented_Save, &Unimplemented_Restore ,
  12 -               "Task sound" ,"task_sound","Command line task saving/restoring sound settings.", PREFIX "/share/pixmaps/gpe-config-admin.png"}
  13 +               "Task sound" ,"task_sound","Command line task saving/restoring sound settings.", PREFIX "/share/pixmaps/gpe-config-admin.png"},
  14 +    { &Unimplemented_Build_Objects, &Unimplemented_Free_Objects, &Unimplemented_Save, &Unimplemented_Restore ,
  15 +               "Task background image" ,"task_background","Only select background image.", PREFIX "/share/pixmaps/gpe-config-admin.png"}
  16    };
  17
  18  struct gpe_icon my_icons[] = {
  19 @@ -235,10 +237,24 @@
  20
  21  void initwindow()
  22  {
  23 -   // main window
  24 +  gint size_x, size_y;
  25 +
  26 +   /* screen layout detection */
  27 +   size_x = gdk_screen_width();
  28 +   size_y = gdk_screen_height();
  29 +
  30 +
  31 +   /* main window */
  32     self.w = mainw = gtk_window_new(GTK_WINDOW_TOPLEVEL);
  33 -   wstyle = self.w->style;
  34     gtk_widget_set_usize(GTK_WIDGET(self.w),240, 310);
  35 +
  36 +   if ((size_x > 640) && (size_y > 480))
  37 +   {
  38 +      gtk_window_set_type_hint(GTK_WINDOW(self.w), GDK_WINDOW_TYPE_HINT_DIALOG);
  39 +         gtk_window_set_default_size(GTK_WINDOW(self.w), 420, 460);
  40 +   }
  41 +
  42 +   wstyle = self.w->style;
  43
  44     gtk_signal_connect (GTK_OBJECT(self.w), "delete-event",
  45                        (GtkSignalFunc) gtk_main_quit, NULL);
  46 @@ -337,18 +353,27 @@
  47                           fprintf(stderr,_("'task_sound' needs (s)ave/(r)estore as argument.\n"));
  48                   exit(0);
  49           }
  50 +         if (!strcmp(argv[1], "task_background"))
  51 +         {
  52 +                 special_flag = TRUE;
  53 +                 standalone = TRUE;
  54 +                 task_change_background_image();
  55 +                 exit(0);
  56 +         }
  57    }
  58
  59    /* If no task? - start applet */
  60    if (!handled)
  61    {
  62           self.cur_applet = -1;
  63 -         self.applet = NULL;     if (!standalone)
  64 +         self.applet = NULL;
  65 +
  66 +         if (!standalone)
  67           {
  68                   initwindow();
  69
  70                   self.vbox = gtk_vbox_new(FALSE,0);
  71 -                 gtk_container_add(GTK_CONTAINER(self.w),self.vbox);
  72 +                 gtk_container_add(GTK_CONTAINER(self.w), self.vbox);
  73
  74                   make_container();
  75
  76 Index: network.c
  77 ===================================================================
  78 RCS file: /cvs/gpe/base/gpe-conf/network.c,v
  79 retrieving revision 1.38
  80 diff -u -r1.38 network.c
  81 --- network.c   16 Oct 2004 16:03:42 -0000      1.38
  82 +++ network.c   26 Oct 2004 14:52:24 -0000
  83 @@ -475,7 +475,7 @@
  84                                         GTK_RESPONSE_REJECT,
  85                                         NULL);
  86
  87 -       gtk_window_set_default_size(GTK_WINDOW(dialog), 200, 290);
  88 +       gtk_window_set_default_size(GTK_WINDOW(dialog), 220, 320);
  89
  90         btnok = gtk_dialog_add_button(GTK_DIALOG(dialog),
  91                                       GTK_STOCK_OK, GTK_RESPONSE_OK);
  92 Index: theme.c
  93 ===================================================================
  94 RCS file: /cvs/gpe/base/gpe-conf/theme.c,v
  95 retrieving revision 1.49
  96 diff -u -r1.49 theme.c
  97 --- theme.c     22 Sep 2004 16:50:01 -0000      1.49
  98 +++ theme.c     26 Oct 2004 14:52:28 -0000
  99 @@ -128,9 +128,57 @@
 100         /* prefer xst */
 101         if (!access(CMD_XST,X_OK))
 102                 use_xst = TRUE;
 103 -       else
 104 -               if (!access(CMD_GCONF,X_OK))
 105 -                       use_gconf = TRUE;
 106 +       /* to be extended in future */
 107 +}
 108 +
 109 +void
 110 +task_change_background_image(void)
 111 +{
 112 +       GtkWidget *filesel, *feedbackdlg;
 113 +
 114 +       Theme_Build_Objects();
 115 +       filesel = gtk_file_selection_new(_("Choose backgound image"));
 116 +       gtk_file_selection_set_select_multiple(GTK_FILE_SELECTION(filesel), FALSE);
 117 +
 118 +       if (gtk_dialog_run(GTK_DIALOG(filesel)) == GTK_RESPONSE_OK)
 119 +       {
 120 +               int ec = 0;
 121 +               const gchar *file =
 122 +                       gtk_file_selection_get_filename (GTK_FILE_SELECTION(filesel));
 123 +
 124 +               gtk_widget_hide(filesel);
 125 +               ec = access(file, R_OK);
 126 +               if (ec)
 127 +                       feedbackdlg = gtk_message_dialog_new(GTK_WINDOW(filesel),
 128 +                         GTK_DIALOG_MODAL, GTK_MESSAGE_INFO, GTK_BUTTONS_OK,
 129 +                         _("You are not allowed to read this file, choose another."));
 130 +               else
 131 +               {
 132 +                       gchar *confstr = NULL;
 133 +                               if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(self.rbImgCent)))
 134 +                                       confstr = g_strdup_printf("img-centered:%s", file);
 135 +                               else if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(self.rbImgStr)))
 136 +                                       confstr = g_strdup_printf("img-stretched:%s", file);
 137 +                               else if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(self.rbImgTiled)))
 138 +                                       confstr = g_strdup_printf("img-tiled:%s", file);
 139 +                       if (confstr != NULL)
 140 +                       {
 141 +                               gchar *p = g_strdup_printf (CMD_XST " write %s%s str '%s'",
 142 +                                                           KEY_MATCHBOX, "Background", confstr);
 143 +                               system(p);
 144 +                               g_free(p);
 145 +                               g_free(confstr);
 146 +                       }
 147 +
 148 +                       feedbackdlg = gtk_message_dialog_new(GTK_WINDOW(filesel),
 149 +                         GTK_DIALOG_MODAL, GTK_MESSAGE_INFO, GTK_BUTTONS_OK,
 150 +                         "%s\n%s",_("Succesfully changed background image."),
 151 +                         _("Use \"Look and Feel\" setup tool to change details."));
 152 +               }
 153 +               gtk_dialog_run(GTK_DIALOG(feedbackdlg));
 154 +               gtk_widget_destroy(feedbackdlg);
 155 +       }
 156 +       gtk_widget_destroy(filesel);
 157  }
 158
 159  gboolean
 160 Index: theme.h
 161 ===================================================================
 162 RCS file: /cvs/gpe/base/gpe-conf/theme.h,v
 163 retrieving revision 1.5
 164 diff -u -r1.5 theme.h
 165 --- theme.h     28 Feb 2003 20:58:45 -0000      1.5
 166 +++ theme.h     26 Oct 2004 14:52:28 -0000
 167 @@ -4,8 +4,9 @@
 168  GtkWidget *Theme_Build_Objects();
 169  void Theme_Save();
 170  void Theme_Restore();
 171 +void task_change_background_image(void);
 172
 173 -// definitions taken from mbdesktop.h
 174 +/* definitions taken from mbdesktop.h */
 175  enum {
 176    BG_SOLID = 1,
 177    BG_TILED_PXM,
 178 Index: suid.c
 179 ===================================================================
 180 RCS file: /cvs/gpe/base/gpe-conf/suid.c,v
 181 retrieving revision 1.53
 182 diff -u -r1.53 suid.c
 183 --- suid.c      25 Oct 2004 16:19:42 -0000      1.53
 184 +++ suid.c      26 Oct 2004 14:52:28 -0000
 185 @@ -376,6 +376,7 @@
 186                                 }
 187                                 else if (strcmp (cmd, "XCAL") == 0)  // runs screen calibration tool
 188                                 {
 189 +                                       fscanf (in, "%100s", arg2);
 190                                         system ("/usr/bin/xtscal");
 191                                 }
 192                                 else if (strcmp (cmd, "STZO") == 0)  // changes the timezone setting