Arranging widgets

Move widgets and dialogs to appropriate dirs.

src/admc/CMakeLists.txt

@@ -38,50 +38,57 @@ set(ADMC_SOURCES
 
     main_window.cpp
     main_window_connection_error.cpp
-    find_widget.cpp
     tab_widget.cpp
-    policy_results_widget.cpp
-    edit_query_item_widget.cpp
+    create_object_helper.cpp
+    rename_object_helper.cpp
 
-    policy_ou_results_widget/policy_ou_results_widget.cpp
-    policy_ou_results_widget/inherited_policies_widget.cpp
-    policy_ou_results_widget/linked_policies_widget.cpp
-    policy_ou_results_widget/drag_drop_links_model.cpp
+    results_widgets/policy_ou_results_widget/policy_ou_results_widget.cpp
+    results_widgets/policy_ou_results_widget/inherited_policies_widget.cpp
+    results_widgets/policy_ou_results_widget/linked_policies_widget.cpp
+    results_widgets/policy_ou_results_widget/drag_drop_links_model.cpp
+    results_widgets/policy_results_widget.cpp
+    results_widgets/domain_info_results_widget/domain_info_results_widget.cpp
+
+    create_dialogs/create_user_dialog.cpp
+    create_dialogs/create_group_dialog.cpp
+    create_dialogs/create_computer_dialog.cpp
+    create_dialogs/create_ou_dialog.cpp
+    create_dialogs/create_shared_folder_dialog.cpp
+    create_dialogs/create_contact_dialog.cpp
+    create_dialogs/create_policy_dialog.cpp
+    create_dialogs/create_query_item_dialog.cpp
+    create_dialogs/create_query_folder_dialog.cpp
+
+    rename_dialogs/rename_other_dialog.cpp
+    rename_dialogs/rename_policy_dialog.cpp
+    rename_dialogs/rename_user_dialog.cpp
+    rename_dialogs/rename_group_dialog.cpp
+
+    select_dialogs/select_object_dialog.cpp
+    select_dialogs/select_object_match_dialog.cpp
+    select_dialogs/select_object_advanced_dialog.cpp
+    select_dialogs/select_container_dialog.cpp
+    select_dialogs/select_policy_dialog.cpp
+
+    edit_query_widgets/edit_query_item_dialog.cpp
+    edit_query_widgets/edit_query_folder_dialog.cpp
+    edit_query_widgets/edit_query_item_widget.cpp
+
+    properties_widgets/properties_dialog.cpp
+    properties_widgets/properties_multi_dialog.cpp
+    properties_widgets/properties_warning_dialog.cpp
+
+    find_widgets/find_policy_dialog.cpp
+    find_widgets/find_object_dialog.cpp
+    find_widgets/find_widget.cpp
 
     console_filter_dialog.cpp
     password_dialog.cpp
-    rename_object_helper.cpp
-    rename_other_dialog.cpp
-    rename_policy_dialog.cpp
-    rename_user_dialog.cpp
-    rename_group_dialog.cpp
-    create_object_helper.cpp
-    create_user_dialog.cpp
-    create_group_dialog.cpp
-    create_computer_dialog.cpp
-    create_ou_dialog.cpp
-    create_shared_folder_dialog.cpp
-    create_contact_dialog.cpp
-    create_policy_dialog.cpp
-    create_query_item_dialog.cpp
-    create_query_folder_dialog.cpp
-    find_object_dialog.cpp
-    select_object_dialog.cpp
-    select_object_match_dialog.cpp
-    select_object_advanced_dialog.cpp
-    select_container_dialog.cpp
-    select_policy_dialog.cpp
     about_dialog.cpp
-    edit_query_item_dialog.cpp
-    edit_query_folder_dialog.cpp
-    properties_dialog.cpp
-    properties_multi_dialog.cpp
-    properties_warning_dialog.cpp
     security_sort_warning_dialog.cpp
     connection_options_dialog.cpp
     changelog_dialog.cpp
     error_log_dialog.cpp
-    find_policy_dialog.cpp
 
     fsmo/fsmo_dialog.cpp
     fsmo/fsmo_tab.cpp
@@ -196,8 +203,6 @@ set(ADMC_SOURCES
     console_impls/found_policy_impl.cpp
     console_impls/domain_info_impl.cpp
 
-    domain_info_results_widget/domain_info_results_widget.cpp
-
     admc.qrc
 )
 

src/admc/attribute_edits/manager_widget.cpp

@@ -23,8 +23,8 @@
 
 #include "adldap.h"
 #include "globals.h"
-#include "properties_dialog.h"
-#include "select_object_dialog.h"
+#include "properties_widgets/properties_dialog.h"
+#include "select_dialogs/select_object_dialog.h"
 #include "utils.h"
 
 ManagerWidget::ManagerWidget(QWidget *parent)

src/admc/console_impls/all_policies_folder_impl.cpp

@@ -25,7 +25,7 @@
 #include "console_impls/policy_impl.h"
 #include "console_impls/policy_root_impl.h"
 #include "console_widget/results_view.h"
-#include "create_policy_dialog.h"
+#include "create_dialogs/create_policy_dialog.h"
 #include "globals.h"
 #include "gplink.h"
 #include "status.h"

src/admc/console_impls/domain_info_impl.cpp

@@ -19,7 +19,7 @@
 
 #include "domain_info_impl.h"
 #include "console_widget/console_widget.h"
-#include "domain_info_results_widget/domain_info_results_widget.h"
+#include "results_widgets/domain_info_results_widget/domain_info_results_widget.h"
 #include "console_impls/object_impl.h"
 #include "console_impls/policy_root_impl.h"
 #include "console_impls/query_folder_impl.h"

src/admc/console_impls/object_impl.cpp

@@ -30,24 +30,24 @@
 #include "console_impls/query_folder_impl.h"
 #include "console_impls/query_item_impl.h"
 #include "console_widget/results_view.h"
-#include "create_computer_dialog.h"
-#include "create_contact_dialog.h"
-#include "create_group_dialog.h"
-#include "create_ou_dialog.h"
-#include "create_shared_folder_dialog.h"
-#include "create_user_dialog.h"
-#include "find_object_dialog.h"
+#include "create_dialogs/create_computer_dialog.h"
+#include "create_dialogs/create_contact_dialog.h"
+#include "create_dialogs/create_group_dialog.h"
+#include "create_dialogs/create_ou_dialog.h"
+#include "create_dialogs/create_shared_folder_dialog.h"
+#include "create_dialogs/create_user_dialog.h"
+#include "find_widgets/find_object_dialog.h"
 #include "globals.h"
 #include "password_dialog.h"
-#include "properties_dialog.h"
-#include "properties_multi_dialog.h"
-#include "rename_group_dialog.h"
-#include "rename_object_dialog.h"
-#include "rename_other_dialog.h"
-#include "rename_user_dialog.h"
+#include "properties_widgets/properties_dialog.h"
+#include "properties_widgets/properties_multi_dialog.h"
+#include "rename_dialogs/rename_group_dialog.h"
+#include "rename_dialogs/rename_object_dialog.h"
+#include "rename_dialogs/rename_other_dialog.h"
+#include "rename_dialogs/rename_user_dialog.h"
 #include "search_thread.h"
-#include "select_container_dialog.h"
-#include "select_object_dialog.h"
+#include "select_dialogs/select_container_dialog.h"
+#include "select_dialogs/select_object_dialog.h"
 #include "settings.h"
 #include "status.h"
 #include "utils.h"

src/admc/console_impls/policy_impl.cpp

@@ -28,10 +28,10 @@
 #include "console_impls/policy_ou_impl.h"
 #include "console_impls/policy_root_impl.h"
 #include "globals.h"
-#include "policy_results_widget.h"
-#include "properties_dialog.h"
-#include "rename_policy_dialog.h"
-#include "select_object_dialog.h"
+#include "results_widgets/policy_results_widget.h"
+#include "properties_widgets/properties_dialog.h"
+#include "rename_dialogs/rename_policy_dialog.h"
+#include "select_dialogs/select_object_dialog.h"
 #include "status.h"
 #include "utils.h"
 #include "icon_manager/icon_manager.h"

src/admc/console_impls/policy_ou_impl.cpp

@@ -25,12 +25,12 @@
 #include "console_impls/item_type.h"
 #include "console_impls/object_impl.h"
 #include "console_impls/policy_impl.h"
-#include "create_policy_dialog.h"
-#include "find_policy_dialog.h"
+#include "create_dialogs/create_policy_dialog.h"
+#include "find_widgets/find_policy_dialog.h"
 #include "globals.h"
 #include "gplink.h"
-#include "policy_ou_results_widget/policy_ou_results_widget.h"
-#include "select_policy_dialog.h"
+#include "results_widgets/policy_ou_results_widget/policy_ou_results_widget.h"
+#include "select_dialogs/select_policy_dialog.h"
 #include "status.h"
 #include "utils.h"
 #include "icon_manager/icon_manager.h"

src/admc/console_impls/query_folder_impl.cpp

@@ -25,9 +25,9 @@
 #include "console_impls/object_impl.h"
 #include "console_impls/query_item_impl.h"
 #include "console_widget/results_view.h"
-#include "create_query_folder_dialog.h"
-#include "create_query_item_dialog.h"
-#include "edit_query_folder_dialog.h"
+#include "create_dialogs/create_query_folder_dialog.h"
+#include "create_dialogs/create_query_item_dialog.h"
+#include "edit_query_widgets/edit_query_folder_dialog.h"
 #include "globals.h"
 #include "settings.h"
 #include "utils.h"

src/admc/console_impls/query_item_impl.cpp

@@ -25,8 +25,8 @@
 #include "console_impls/object_impl.h"
 #include "console_impls/query_folder_impl.h"
 #include "console_widget/results_view.h"
-#include "create_query_item_dialog.h"
-#include "edit_query_item_dialog.h"
+#include "create_dialogs/create_query_item_dialog.h"
+#include "edit_query_widgets/edit_query_item_dialog.h"
 #include "globals.h"
 #include "settings.h"
 #include "utils.h"

src/admc/create_dialogs/create_query_item_dialog.ui

@@ -33,7 +33,7 @@
   <customwidget>
    <class>EditQueryItemWidget</class>
    <extends>QWidget</extends>
-   <header>edit_query_item_widget.h</header>
+   <header>edit_query_widgets/edit_query_item_widget.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>

src/admc/edit_query_widgets/edit_query_item_dialog.ui

@@ -33,7 +33,7 @@
   <customwidget>
    <class>EditQueryItemWidget</class>
    <extends>QWidget</extends>
-   <header>edit_query_item_widget.h</header>
+   <header>edit_query_widgets/edit_query_item_widget.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>

src/admc/filter_widget/select_base_widget.cpp

@@ -23,7 +23,7 @@
 
 #include "adldap.h"
 #include "globals.h"
-#include "select_container_dialog.h"
+#include "select_dialogs/select_container_dialog.h"
 #include "utils.h"
 
 SelectBaseWidget::SelectBaseWidget(QWidget *parent)

src/admc/find_widgets/find_object_dialog.ui

@@ -23,7 +23,7 @@
   <customwidget>
    <class>FindWidget</class>
    <extends>QWidget</extends>
-   <header>find_widget.h</header>
+   <header>find_widgets/find_widget.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>