New upstream version 3.3.3+dfsg1.upstream/3.3.3+dfsg1

1 files changed, 9 insertions, 20 deletions

diff --git a/SQLiteStudio3/guiSQLiteStudio/iconmanager.h b/SQLiteStudio3/guiSQLiteStudio/iconmanager.h
index 6034de1..6bff0e0 100644
--- a/SQLiteStudio3/guiSQLiteStudio/iconmanager.h
+++ b/SQLiteStudio3/guiSQLiteStudio/iconmanager.h
@@ -18,7 +18,6 @@ class GUI_API_EXPORT IconManager : public QObject
 
     public:
         DEF_ICONS(Icons, iconEnums,
-            DEF_ICON(ABORT24,                           "abort24")
             DEF_ICON(ACT_ABORT,                         "act_abort")
             DEF_ICON(ACT_CLEAR,                         "act_clear")
             DEF_ICON(ACT_COPY,                          "act_copy")
@@ -27,7 +26,6 @@ class GUI_API_EXPORT IconManager : public QObject
             DEF_ICON(ACT_DELETE,                        "act_delete")
             DEF_ICON(ACT_PASTE,                         "act_paste")
             DEF_ICON(ACT_REDO,                          "act_redo")
-            DEF_ICON(ACT_SEARCH,                        "act_search")
             DEF_ICON(ACT_SELECT_ALL,                    "act_select_all")
             DEF_ICON(ACT_UNDO,                          "act_undo")
             DEF_ICON(APPLY_FILTER,                      "apply_filter")
@@ -55,7 +53,6 @@ class GUI_API_EXPORT IconManager : public QObject
             DEF_ICON(COMPLETER_PRAGMA,                  "completer_pragma")
             DEF_ICON(COMPLETER_STRING,                  "completer_string")
             DEF_ICON(CONFIGURE,                         "configure")
-            DEF_ICON(CONFIGURE_CONSTRAINT,              "configure_constraint")
             DEF_ICON(CONSTRAINT_CHECK,                  "check")
             DEF_ICO2(CONSTRAINT_CHECK_ADD,              CONSTRAINT_CHECK, PLUS)
             DEF_ICON(CONSTRAINT_COLLATION,              "collation")
@@ -64,27 +61,27 @@ class GUI_API_EXPORT IconManager : public QObject
             DEF_ICO2(CONSTRAINT_DEFAULT_ADD,            CONSTRAINT_DEFAULT, PLUS)
             DEF_ICON(CONSTRAINT_FOREIGN_KEY,            "fk")
             DEF_ICO2(CONSTRAINT_FOREIGN_KEY_ADD,        CONSTRAINT_FOREIGN_KEY, PLUS)
+            DEF_ICON(CONSTRAINT_GENERATED,              "generated")
+            DEF_ICO2(CONSTRAINT_GENERATED_STORED,       CONSTRAINT_GENERATED, DISK)
+            DEF_ICO2(CONSTRAINT_GENERATED_VIRTUAL,      CONSTRAINT_GENERATED, LIGHTENING)
+            DEF_ICO2(CONSTRAINT_GENERATED_ADD,          CONSTRAINT_GENERATED, PLUS)
             DEF_ICON(CONSTRAINT_NOT_NULL,               "not_null")
             DEF_ICO2(CONSTRAINT_NOT_NULL_ADD,           CONSTRAINT_NOT_NULL, PLUS)
             DEF_ICON(CONSTRAINT_PRIMARY_KEY,            "pk")
             DEF_ICO2(CONSTRAINT_PRIMARY_KEY_ADD,        CONSTRAINT_PRIMARY_KEY, PLUS)
             DEF_ICON(CONSTRAINT_UNIQUE,                 "unique")
             DEF_ICO2(CONSTRAINT_UNIQUE_ADD,             CONSTRAINT_UNIQUE, PLUS)
-            DEF_ICON(CONVERT_DB,                        "convert_db")
             DEF_ICON(VACUUM_DB,                         "vacuum_db")
             DEF_ICON(INTEGRITY_CHECK,                   "integrity_check")
             DEF_ICON(DATABASE,                          "database")
             DEF_ICO2(DATABASE_ADD,                      DATABASE, PLUS)
             DEF_ICON(DATABASE_CONNECT,                  "database_connect")
-            DEF_ICON(DATABASE_CONNECTED,                "database_connected")
             DEF_ICO2(DATABASE_DEL,                      DATABASE, MINUS)
             DEF_ICON(DATABASE_DISCONNECT,               "database_disconnect")
             DEF_ICO2(DATABASE_EDIT,                     DATABASE, EDIT)
             DEF_ICON(DATABASE_EXPORT,                   "database_export")
             DEF_ICON(DATABASE_EXPORT_WIZARD,            "database_export_wizard")
-            DEF_ICON(DATABASE_FILE,                     "database_file")
             DEF_ICON(DATABASE_IMPORT_WIZARD,            "database_import_wizard")
-            DEF_ICON(DATABASE_NETWORK,                  "database_network")
             DEF_ICON(DATABASE_OFFLINE,                  "database_offline")
             DEF_ICO2(DATABASE_INVALID,                  DATABASE_OFFLINE, WARNING)
             DEF_ICON(DATABASE_ONLINE,                   "database_online")
@@ -103,9 +100,7 @@ class GUI_API_EXPORT IconManager : public QObject
             DEF_ICO2(DIRECTORY_EDIT,                    DIRECTORY, EDIT)
             DEF_ICON(DIRECTORY_OPEN,                    "directory_open")
             DEF_ICON(DIRECTORY_OPEN_WITH_DB,            "directory_open_with_db")
-            DEF_ICON(DIRECTORY_WITH_DB,                 "directory_with_db")
-            DEF_ICON(DOCK_LAYOUT_HORIZONTAL,            "dock_layout_horizontal")
-            DEF_ICON(DOCK_LAYOUT_VERTICAL,              "dock_layout_vertical")
+            DEF_ICO3(DONATE,                            TEST_CONN_OK)
             DEF_ICON(ERASE,                             "erase")
             DEF_ICON(ERASE_TABLE_DATA,                  "erase_table_data")
             DEF_ICON(EXEC_QUERY,                        "exec_query")
@@ -116,7 +111,6 @@ class GUI_API_EXPORT IconManager : public QObject
             DEF_ICON(EXTENSION,                         "brick")
             DEF_ICON(EXTENSION_ADD,                     "brick_add")
             DEF_ICON(EXTENSION_DELETE,                  "brick_delete")
-            DEF_ICON(EXTENSION_EDITOR,                  "brick_folder")
             DEF_ICON(EXTENSION_ERROR,                   "brick_error")
             DEF_ICON(FEATURE_REQUEST,                   "feature_request")
             DEF_ICON(FONT_BROWSE,                       "font_browse")
@@ -138,7 +132,6 @@ class GUI_API_EXPORT IconManager : public QObject
             DEF_ICON(INDICATOR_HINT,                    "indicator_hint")
             DEF_ICON(INDICATOR_INFO,                    "indicator_info")
             DEF_ICON(INDICATOR_WARN,                    "indicator_warn")
-            DEF_ICON(INFO_BALLOON,                      "info_balloon")
             DEF_ICON(INDEX_EXPR_ADD,                    "tag_hash_add")
             DEF_ICON(INDEX_EXPR_EDIT,                   "tag_hash_edit")
             DEF_ICON(INDEX_EXPR_DEL,                    "tag_hash_del")
@@ -147,15 +140,15 @@ class GUI_API_EXPORT IconManager : public QObject
             DEF_ICO3(INSERT_FN_ARG,                     INSERT_ROW)
             DEF_ICO3(INSERT_DATATYPE,                   INSERT_ROW)
             DEF_ICON(KEYWORD,                           "keyword")
-            DEF_ICON(KEYBOARD,                          "keyboard")
-            DEF_ICON(LOADING,                           "loading")
             DEF_ICON(LICENSES,                          "licenses")
+            DEF_ICON(LOADING,                           "loading")
+            DEF_ICON(LOAD_FULL_VALUE,                   "load_full_value")
+            DEF_ICON(LOAD_FULL_VALUES,                  "load_full_values")
             DEF_ICON(MOVE_DOWN,                         "move_down")
             DEF_ICON(MOVE_UP,                           "move_up")
             DEF_ICO3(NEW_COLLATION,                     INSERT_ROW)
             DEF_ICO3(NEW_FUNCTION,                      INSERT_ROW)
             DEF_ICON(OPEN_FILE,                         "open_sql_file")
-            DEF_ICON(OPEN_FORUM,                        "open_forum")
             DEF_ICON(OPEN_SQL_EDITOR,                   "open_sql_editor")
             DEF_ICO3(OPEN_SQL_FILE,                     OPEN_FILE)
             DEF_ICON(OPEN_VALUE_EDITOR,                 "open_value_editor")
@@ -166,6 +159,7 @@ class GUI_API_EXPORT IconManager : public QObject
             DEF_ICO3(MOVE_LEFT,                         PAGE_PREV)
             DEF_ICO3(MOVE_RIGHT,                        PAGE_NEXT)
             DEF_ICON(PLUS,                              "plus")
+            DEF_ICON(QUIT,                              "quit")
             DEF_ICON(RELOAD,                            "reload")
             DEF_ICON(RENAME_FN_ARG,                     "rename_fn_arg")
             DEF_ICO3(RENAME_DATATYPE,                   RENAME_FN_ARG)
@@ -200,8 +194,6 @@ class GUI_API_EXPORT IconManager : public QObject
             DEF_ICON(SORT_COUNT_19,                     "sort_cnt_19")
             DEF_ICON(SORT_COUNT_20,                     "sort_cnt_20")
             DEF_ICON(SORT_COUNT_20_PLUS,                "sort_cnt_20p")
-            DEF_ICON(SORT_INDICATOR_ASC,                "sort_ind_asc")
-            DEF_ICON(SORT_INDICATOR_DESC,               "sort_ind_desc")
             DEF_ICON(SORT_RESET,                        "sort_reset")
             DEF_ICON(SQLITE_DOCS,                       "sqlite_docs")
             DEF_ICON(SQLITESTUDIO_APP,                  "sqlitestudio")
@@ -229,7 +221,6 @@ class GUI_API_EXPORT IconManager : public QObject
             DEF_ICON(TABS_ON_TOP,                       "tabs_on_top")
             DEF_ICON(TEST_CONN_ERROR,                   "test_conn_error")
             DEF_ICON(TEST_CONN_OK,                      "test_conn_ok")
-            DEF_ICON(TIP,                               "tip")
             DEF_ICON(TRIGGER,                           "trigger")
             DEF_ICO2(TRIGGER_ADD,                       TRIGGER, PLUS)
             DEF_ICON(TRIGGER_COLUMNS,                   "trigger_columns")
@@ -237,8 +228,6 @@ class GUI_API_EXPORT IconManager : public QObject
             DEF_ICO2(TRIGGER_DEL,                       TRIGGER, MINUS)
             DEF_ICO2(TRIGGER_EDIT,                      TRIGGER, EDIT)
             DEF_ICON(TRIGGERS,                          "triggers")
-            DEF_ICON(USER,                              "user")
-            DEF_ICON(USER_UNKNOWN,                      "user_unknown")
             DEF_ICON(USER_MANUAL,                       "user_manual")
             DEF_ICON(VIEW,                              "view")
             DEF_ICO2(VIEW_ADD,                          VIEW, PLUS)