← Back to branch summary

~vcs-imports/glade/master

« back to all changes in this revision

Viewing changes to src/glade-window.c

  • Committer: Tristan Van Berkom
  • Date: 2011-01-10 09:06:38 UTC
  • mfrom: (2120.2.182)
  • Revision ID: git-v1:7be60d7441f57088dde6e4cbb646c53c5f724731
Merge branch 'master' into signal-tree-model

Conflicts:
        ChangeLog

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/glade-window.c
1122
1122
    return;
1123
1123
 
1124
1124
  /* check for external modification to the project file */
1125
 
  mtime = glade_util_get_file_mtime (glade_project_get_path (project), NULL);
1126
 
 
1127
 
  if (mtime > glade_project_get_file_mtime (project))
 
1125
  if (glade_project_get_path (project))
1128
1126
    {
1129
 
 
1130
 
      dialog = gtk_message_dialog_new (GTK_WINDOW (window),
1131
 
                                       GTK_DIALOG_MODAL,
1132
 
                                       GTK_MESSAGE_WARNING,
1133
 
                                       GTK_BUTTONS_NONE,
1134
 
                                       _
1135
 
                                       ("The file %s has been modified since reading it"),
1136
 
                                       glade_project_get_path (project));
1137
 
 
1138
 
      gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
1139
 
                                                _
1140
 
                                                ("If you save it, all the external changes could be lost. Save it anyway?"));
1141
 
 
1142
 
      gtk_window_set_title (GTK_WINDOW (dialog), "");
1143
 
 
1144
 
      button = gtk_button_new_with_mnemonic (_("_Save Anyway"));
1145
 
      gtk_button_set_image (GTK_BUTTON (button),
1146
 
                            gtk_image_new_from_stock (GTK_STOCK_SAVE,
1147
 
                                                      GTK_ICON_SIZE_BUTTON));
1148
 
      gtk_widget_show (button);
1149
 
 
1150
 
      gtk_dialog_add_action_widget (GTK_DIALOG (dialog), button,
1151
 
                                    GTK_RESPONSE_ACCEPT);
1152
 
      gtk_dialog_add_button (GTK_DIALOG (dialog), _("_Don't Save"),
1153
 
                             GTK_RESPONSE_REJECT);
1154
 
 
1155
 
      gtk_dialog_set_default_response (GTK_DIALOG (dialog),
1156
 
                                       GTK_RESPONSE_REJECT);
1157
 
 
1158
 
      response = gtk_dialog_run (GTK_DIALOG (dialog));
1159
 
 
1160
 
      gtk_widget_destroy (dialog);
1161
 
 
1162
 
      if (response == GTK_RESPONSE_REJECT)
1163
 
        {
1164
 
          g_free (display_path);
1165
 
          return;
1166
 
        }
 
1127
      mtime = glade_util_get_file_mtime (glade_project_get_path (project), NULL);
 
1128
 
 
1129
      if (mtime > glade_project_get_file_mtime (project))
 
1130
        {
 
1131
 
 
1132
          dialog = gtk_message_dialog_new (GTK_WINDOW (window),
 
1133
                                           GTK_DIALOG_MODAL,
 
1134
                                           GTK_MESSAGE_WARNING,
 
1135
                                           GTK_BUTTONS_NONE,
 
1136
                                           _("The file %s has been modified since reading it"),
 
1137
                                           glade_project_get_path (project));
 
1138
 
 
1139
          gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
 
1140
                                                    _("If you save it, all the external changes could be lost. "
 
1141
                                                      "Save it anyway?"));
 
1142
 
 
1143
          gtk_window_set_title (GTK_WINDOW (dialog), "");
 
1144
 
 
1145
          button = gtk_button_new_with_mnemonic (_("_Save Anyway"));
 
1146
          gtk_button_set_image (GTK_BUTTON (button),
 
1147
                                gtk_image_new_from_stock (GTK_STOCK_SAVE,
 
1148
                                                          GTK_ICON_SIZE_BUTTON));
 
1149
          gtk_widget_show (button);
 
1150
 
 
1151
          gtk_dialog_add_action_widget (GTK_DIALOG (dialog), button,
 
1152
                                        GTK_RESPONSE_ACCEPT);
 
1153
          gtk_dialog_add_button (GTK_DIALOG (dialog), _("_Don't Save"),
 
1154
                                 GTK_RESPONSE_REJECT);
 
1155
 
 
1156
          gtk_dialog_set_default_response (GTK_DIALOG (dialog),
 
1157
                                           GTK_RESPONSE_REJECT);
 
1158
 
 
1159
          response = gtk_dialog_run (GTK_DIALOG (dialog));
 
1160
 
 
1161
          gtk_widget_destroy (dialog);
 
1162
 
 
1163
          if (response == GTK_RESPONSE_REJECT)
 
1164
            {
 
1165
              g_free (display_path);
 
1166
              return;
 
1167
            }
 
1168
        }
1167
1169
    }
1168
1170
 
1169
1171
  /* Interestingly; we cannot use `path' after glade_project_reset_path
2316
2318
 
2317
2319
static GtkRadioActionEntry radio_entries[] = {
2318
2320
 
2319
 
  {"IconsAndLabels", NULL, N_("Text beside icons"), NULL,
 
2321
  {"IconsAndLabels", NULL, N_("Text _beside icons"), NULL,
2320
2322
   N_("Display items as text beside icons"), GLADE_ITEM_ICON_AND_LABEL},
2321
2323
 
2322
2324
  {"IconsOnly", NULL, N_("_Icons only"), NULL,
2544
2546
  gtk_tool_button_set_label (GTK_TOOL_BUTTON (button), _("Drag Resize"));
2545
2547
 
2546
2548
  gtk_tool_item_set_tooltip_text (GTK_TOOL_ITEM (button),
2547
 
                                  _
2548
 
                                  ("Drag and resize widgets in the workspace"));
 
2549
                                  _("Drag and resize widgets in the workspace"));
2549
2550
 
2550
2551
  gtk_widget_show (GTK_WIDGET (button));
2551
2552
  gtk_widget_show (image);
3275
3276
  load_paned_position (config, window->priv->right_pane, "right_pane", 220);
3276
3277
}
3277
3278
 
 
3279
static gboolean
 
3280
raise_window_idle (GtkWindow *window)
 
3281
{
 
3282
  gtk_window_present (window);
 
3283
  return FALSE;
 
3284
}
3278
3285
 
3279
3286
static void
3280
3287
show_dock_first_time (GladeWindow * window,
3298
3305
                                &maximized);
3299
3306
 
3300
3307
  if (detached == 1)
3301
 
    gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), FALSE);
 
3308
    {
 
3309
      gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), FALSE);
 
3310
 
 
3311
      g_idle_add ((GSourceFunc)raise_window_idle, gtk_widget_get_toplevel (dock->widget));
 
3312
    }
3302
3313
 
3303
3314
  if (maximized)
3304
3315
    gtk_window_maximize (GTK_WINDOW (gtk_widget_get_toplevel (dock->widget)));