Changeset 8356 for trunk

Timestamp:

02/02/12 19:18:24 (4 months ago)

Author:

westram

Message:

• removed unused default-param from AW_repeated_question
• use AW_repeated_question in GDE-reimport (used similar inline code)
• replaced a few more uses by aw_message / aw_ask_sure

Location:

trunk

Files:

• ARB_GDE/GDE_event.cxx (modified) (4 diffs)
• NTREE/AP_cprofile.cxx (modified) (2 diffs)
• SL/DB_QUERY/db_query.cxx (modified) (1 diff)
• WINDOW/aw_question.hxx (modified) (1 diff)

trunk/ARB_GDE/GDE_event.cxx

@@ -265 +265 @@
     unsigned long i;
 
-    enum ReplaceMode {
-        REPLACE_SPEC      = 0,
-        REIMPORT_SEQ      = 1,
-        SKIP_IMPORT       = 2,
-        REPLACE_SPEC_ALL  = 3,
-        REIMPORT_SEQ_ALL  = 4,
-        SKIP_IMPORT_ALL   = 5
-    } replace_mode = REPLACE_SPEC;
-
-    enum ChangeMode {
-        ACCEPT_CHANGE     = 0,
-        REJECT_CHANGE     = 1,
-        ACCEPT_CHANGE_ALL = 2,
-        REJECT_CHANGE_ALL = 3
-    } change_mode = ACCEPT_CHANGE;
-
+    AW_repeated_question overwrite_question;
+    AW_repeated_question checksum_change_question;
+    
     arb_progress progress("importing", dataset->numelements-oldnumelements+1); // +1 avoids zero-progress
     for (i = oldnumelements; !error && i < dataset->numelements; i++) {
@@ -330 +317 @@
 
                 if (gb_species) {   // new element that already exists !!!!
-                    if (replace_mode != REPLACE_SPEC_ALL &&
-                        replace_mode != REIMPORT_SEQ_ALL &&
-                        replace_mode != SKIP_IMPORT_ALL)
-                    {
-                        const char *question =
-                            GBS_global_string("You are (re-)importing a species '%s'.\n"
-                                              "That species already exists in your database!\n"
-                                              "\n"
-                                              "Possible actions:\n"
-                                              "\n"
-                                              "       - overwrite existing species (all fields)\n"
-                                              "       - overwrite the sequence (does not change other fields)\n"
-                                              "       - skip import of the species\n"
-                                              "\n"
-                                              "Note: After aligning it's recommended to choose 'overwrite sequence'.",
-                                              savename);
-
-                        replace_mode = (ReplaceMode)aw_question(question,
-                                                                "Overwrite species,Overwrite sequence only,Skip entry,"
-                                                                "^Overwrite ALL species,Overwrite ALL sequences,Skip ALL entries");
-                    }
+                    const char *question =
+                        GBS_global_string("You are (re-)importing a species '%s'.\n"
+                                          "That species already exists in your database!\n"
+                                          "\n"
+                                          "Possible actions:\n"
+                                          "\n"
+                                          "       - overwrite existing species (all fields)\n"
+                                          "       - overwrite the sequence (does not change other fields)\n"
+                                          "       - skip import of the species\n"
+                                          "\n"
+                                          "Note: After aligning it's recommended to choose 'overwrite sequence'.",
+                                          savename);
+
+
+                    enum ReplaceMode { REPLACE_SPEC = 0, REIMPORT_SEQ = 1, SKIP_IMPORT  = 2, }
+                    replace_mode = (ReplaceMode)overwrite_question.get_answer(question, "Overwrite species,Overwrite sequence only,Skip entry", "all", false);
 
                     switch (replace_mode) {
-                        default:
-                            gde_assert(0);
-                            // fall-through
                         case SKIP_IMPORT:
-                        case SKIP_IMPORT_ALL:
                             gb_species = 0;
                             break;
-
                         case REPLACE_SPEC:
-                        case REPLACE_SPEC_ALL:
                             error      = GB_delete(gb_species);
                             gb_species = NULL;
@@ -368 +344 @@
                             // fall-through
                         case REIMPORT_SEQ:
-                        case REIMPORT_SEQ_ALL:
                             gb_species = GBT_find_or_create_species_rel_species_data(gb_species_data, savename);
                             if (!gb_species) error = GB_await_error();
@@ -394 +369 @@
 
                             if (old_checksum != new_checksum) {
-                                if (change_mode != ACCEPT_CHANGE_ALL &&
-                                    change_mode != REJECT_CHANGE_ALL)
-                                {
-                                    const char *question = GBS_global_string("Warning: Sequence checksum of '%s' has changed\n", savename);
-
-                                    change_mode = (ChangeMode)aw_question(question,
-                                                                          "Accept change,Reject (do not import),"
-                                                                          "^Accept ALL,Reject ALL");
-                                }
-
-                                if (change_mode == REJECT_CHANGE || change_mode == REJECT_CHANGE_ALL) {
-                                    writeSequence = false;
-                                }
+                                const char *question = GBS_global_string("Warning: Sequence checksum of '%s' has changed\n", savename);
+                                enum ChangeMode {
+                                    ACCEPT_CHANGE = 0,
+                                    REJECT_CHANGE = 1,
+                                } change_mode = (ChangeMode)checksum_change_question.get_answer(question, "Accept change,Reject", "all", false);
+                                
+                                if (change_mode == REJECT_CHANGE) writeSequence = false;
+
                                 aw_message(GBS_global_string("Warning: Sequence checksum for '%s' has changed (%s)",
                                                              savename, writeSequence ? "accepted" : "rejected"));

trunk/NTREE/AP_cprofile.cxx

@@ -580 +580 @@
     else strcpy(CPRO.result[which_statistic].which_species, "all vs all");
 
-    if ((faultmessage=GB_push_transaction(GLOBAL_gb_main)))
-    {
-        aw_question(faultmessage, "OK,EXIT");
-        delete   align;
+    if ((faultmessage=GB_push_transaction(GLOBAL_gb_main))) {
+        aw_message(faultmessage);
+        free(align);
         return;
     }
@@ -625 +624 @@
     CPRO_deallocate(speciesdata, speciesdatabase);
     free(align);
-    if ((faultmessage=GB_pop_transaction(GLOBAL_gb_main)))
-    {
-        aw_question(faultmessage, "OK,EXIT");
+    if ((faultmessage=GB_pop_transaction(GLOBAL_gb_main))) {
+        aw_message(faultmessage);
         return;
     }

trunk/SL/DB_QUERY/db_query.cxx

@@ -527 +527 @@
     }
 
-    int cancel;
-    {
-        char *question = GBS_global_string_copy("Are you sure to delete %li %s", cnt, selector.items_name);
-        cancel         = aw_question(question, "OK,CANCEL");
-        free(question);
-    }
-
-    if (cancel) {
+    if (!cnt || !aw_ask_sure(GBS_global_string("Are you sure to delete %li %s", cnt, selector.items_name))) {
         GB_abort_transaction(query->gb_main);
         return;

trunk/WINDOW/aw_question.hxx

@@ -45 +45 @@
 
 public:
-    AW_repeated_question(bool dont_ask_again_ = false)
+    AW_repeated_question()
         : answer(0),
-          dont_ask_again(dont_ask_again_),
+          dont_ask_again(false),
           buttons_used(0),
           helpfile(0)