Tidy the MainPage implementation.

M2Team · Jul 18, 2023 · 6ad8ce7 · 6ad8ce7
1 parent a09bc80
commit 6ad8ce7
Show file tree

Hide file tree

Showing 8 changed files with 285 additions and 287 deletions.
diff --git a/NanaGet/MainPage.cpp b/NanaGet/MainPage.cpp
@@ -57,7 +57,7 @@ namespace winrt::NanaGet::implementation
         }
     }
 
-    void MainPage::TaskManagerGridNewTaskButtonClick(
+    void MainPage::NewTaskButtonClick(
         IInspectable const& sender,
         RoutedEventArgs const& e)
     {
@@ -71,7 +71,7 @@ namespace winrt::NanaGet::implementation
             0);
     }
 
-    void MainPage::TaskManagerGridStartAllButtonClick(
+    void MainPage::StartAllButtonClick(
         IInspectable const& sender,
         RoutedEventArgs const& e)
     {
@@ -88,7 +88,7 @@ namespace winrt::NanaGet::implementation
         }
     }
 
-    void MainPage::TaskManagerGridPauseAllButtonClick(
+    void MainPage::PauseAllButtonClick(
         IInspectable const& sender,
         RoutedEventArgs const& e)
     {
@@ -105,7 +105,7 @@ namespace winrt::NanaGet::implementation
         }
     }
 
-    void MainPage::TaskManagerGridClearListButtonClick(
+    void MainPage::ClearListButtonClick(
         IInspectable const& sender,
         RoutedEventArgs const& e)
     {
@@ -122,7 +122,7 @@ namespace winrt::NanaGet::implementation
         }
     }
 
-    void MainPage::TaskManagerGridOpenDownloadsFolderButtonClick(
+    void MainPage::OpenDownloadsFolderButtonClick(
         IInspectable const& sender,
         RoutedEventArgs const& e)
     {
@@ -139,7 +139,7 @@ namespace winrt::NanaGet::implementation
         ::ShellExecuteExW(&ExecInfo);
     }
 
-    void MainPage::TaskManagerGridSettingsButtonClick(
+    void MainPage::SettingsButtonClick(
         IInspectable const& sender,
         RoutedEventArgs const& e)
     {
@@ -153,7 +153,7 @@ namespace winrt::NanaGet::implementation
             0);
     }
 
-    void MainPage::TaskManagerGridAboutButtonClick(
+    void MainPage::AboutButtonClick(
         IInspectable const& sender,
         RoutedEventArgs const& e)
     {
@@ -167,20 +167,20 @@ namespace winrt::NanaGet::implementation
             0);
     }
 
-    void MainPage::TaskManagerGridTaskListContainerContentChanging(
+    void MainPage::TaskListContainerContentChanging(
         ListViewBase const& sender,
         ContainerContentChangingEventArgs const& e)
     {
         UNREFERENCED_PARAMETER(sender);
         UNREFERENCED_PARAMETER(e);
 
-        this->TaskManagerGridTaskListNoItemsTextBlock().Visibility(
+        this->TaskListNoItemsTextBlock().Visibility(
             !sender.ItemsSource()
             ? Visibility::Visible
             : Visibility::Collapsed);
     }
 
-    void MainPage::TaskManagerGridTaskItemRetryButtonClick(
+    void MainPage::TaskItemRetryButtonClick(
         IInspectable const& sender,
         RoutedEventArgs const& e)
     {
@@ -200,7 +200,7 @@ namespace winrt::NanaGet::implementation
         }
     }
 
-    void MainPage::TaskManagerGridTaskItemResumeButtonClick(
+    void MainPage::TaskItemResumeButtonClick(
         IInspectable const& sender,
         RoutedEventArgs const& e)
     {
@@ -218,7 +218,7 @@ namespace winrt::NanaGet::implementation
         }
     }
 
-    void MainPage::TaskManagerGridTaskItemPauseButtonClick(
+    void MainPage::TaskItemPauseButtonClick(
         IInspectable const& sender,
         RoutedEventArgs const& e)
     {
@@ -236,7 +236,7 @@ namespace winrt::NanaGet::implementation
         }
     }
 
-    void MainPage::TaskManagerGridTaskItemCopyLinkButtonClick(
+    void MainPage::TaskItemCopyLinkButtonClick(
         IInspectable const& sender,
         RoutedEventArgs const& e)
     {
@@ -256,7 +256,7 @@ namespace winrt::NanaGet::implementation
         }
     }
 
-    /*void MainPage::TaskManagerGridTaskItemOpenFolderButtonClick(
+    /*void MainPage::TaskItemOpenFolderButtonClick(
         IInspectable const& sender,
         RoutedEventArgs const& e)
     {
@@ -270,7 +270,7 @@ namespace winrt::NanaGet::implementation
             0);
     }*/
 
-    void MainPage::TaskManagerGridTaskItemCancelButtonClick(
+    void MainPage::TaskItemCancelButtonClick(
         IInspectable const& sender,
         RoutedEventArgs const& e)
     {
@@ -288,7 +288,7 @@ namespace winrt::NanaGet::implementation
         }
     }
 
-    void MainPage::TaskManagerGridTaskItemRemoveButtonClick(
+    void MainPage::TaskItemRemoveButtonClick(
         IInspectable const& sender,
         RoutedEventArgs const& e)
     {
@@ -427,11 +427,11 @@ namespace winrt::NanaGet::implementation
             DispatcherQueuePriority::Normal,
             [&]()
         {
-            this->TaskManagerGridGlobalStatusTextBlock().Text(GlobalStatusText);
+            this->GlobalStatusTextBlock().Text(GlobalStatusText);
 
             if (NeedFullRefresh)
             {
-                this->TaskManagerGridTaskList().ItemsSource(this->m_Tasks);
+                this->TaskList().ItemsSource(this->m_Tasks);
             }
             else if(this->m_Tasks)
             {
@@ -444,7 +444,7 @@ namespace winrt::NanaGet::implementation
                 }
                 catch (...)
                 {
-                    
+
                 }
             }
 

diff --git a/NanaGet/MainPage.h b/NanaGet/MainPage.h
@@ -32,63 +32,63 @@ namespace winrt::NanaGet::implementation
 
         ~MainPage();
 
-        void TaskManagerGridNewTaskButtonClick(
+        void NewTaskButtonClick(
             IInspectable const& sender,
             RoutedEventArgs const& e);
 
-        void TaskManagerGridStartAllButtonClick(
+        void StartAllButtonClick(
             IInspectable const& sender,
             RoutedEventArgs const& e);
 
-        void TaskManagerGridPauseAllButtonClick(
+        void PauseAllButtonClick(
             IInspectable const& sender,
             RoutedEventArgs const& e);
 
-        void TaskManagerGridClearListButtonClick(
+        void ClearListButtonClick(
             IInspectable const& sender,
             RoutedEventArgs const& e);
 
-        void TaskManagerGridOpenDownloadsFolderButtonClick(
+        void OpenDownloadsFolderButtonClick(
             IInspectable const& sender,
             RoutedEventArgs const& e);
 
-        void TaskManagerGridSettingsButtonClick(
+        void SettingsButtonClick(
             IInspectable const& sender,
             RoutedEventArgs const& e);
 
-        void TaskManagerGridAboutButtonClick(
+        void AboutButtonClick(
             IInspectable const& sender,
             RoutedEventArgs const& e);
 
-        void TaskManagerGridTaskListContainerContentChanging(
+        void TaskListContainerContentChanging(
             ListViewBase const& sender,
             ContainerContentChangingEventArgs const& e);
 
-        void TaskManagerGridTaskItemRetryButtonClick(
+        void TaskItemRetryButtonClick(
             IInspectable const& sender,
             RoutedEventArgs const& e);
 
-        void TaskManagerGridTaskItemResumeButtonClick(
+        void TaskItemResumeButtonClick(
             IInspectable const& sender,
             RoutedEventArgs const& e);
 
-        void TaskManagerGridTaskItemPauseButtonClick(
+        void TaskItemPauseButtonClick(
             IInspectable const& sender,
             RoutedEventArgs const& e);
 
-        void TaskManagerGridTaskItemCopyLinkButtonClick(
+        void TaskItemCopyLinkButtonClick(
             IInspectable const& sender,
             RoutedEventArgs const& e);
 
-        /*void TaskManagerGridTaskItemOpenFolderButtonClick(
+        /*void TaskItemOpenFolderButtonClick(
             IInspectable const& sender,
             RoutedEventArgs const& e);*/
 
-        void TaskManagerGridTaskItemCancelButtonClick(
+        void TaskItemCancelButtonClick(
             IInspectable const& sender,
             RoutedEventArgs const& e);
 
-        void TaskManagerGridTaskItemRemoveButtonClick(
+        void TaskItemRemoveButtonClick(
             IInspectable const& sender,
             RoutedEventArgs const& e);