Skip to content

Master #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lovelace545 wants to merge 8 commits into
base: master
Choose a base branch
from
Open

Master #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
a9dd855
Create dotnet-desktop.yml
lovelace545 Sep 15, 2024
6af5b23
Update dotnet-desktop.yml
lovelace545 Sep 15, 2024
08d684a
Create dotnet.yml
lovelace545 Sep 15, 2024
81bf472
Delete .github/workflows directory
lovelace545 Sep 15, 2024
dc61be2
update
lovelace545 Sep 15, 2024
54aeb06
11111
lovelace545 Sep 15, 2024
8c867e6
update
lovelace545 Sep 15, 2024
85b3e34
update
lovelace545 Sep 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion AddDeviceWindow.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
namespace IPAM_NOTE
{
/// <summary>
/// AddDeviceWindow.xaml 的交互逻辑
/// AddDeviceWindow.xaml 的交互逻辑11
/// </summary>
public partial class AddDeviceWindow : Window
{
Expand Down
37 changes: 19 additions & 18 deletions MainWindow.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@
</StackPanel>
</TabItem.Header>
</TabItem>
<TabItem
<!--<TabItem

>
<TabItem.Header>
Expand All @@ -139,9 +139,9 @@
Height="28"
HorizontalAlignment="Center"
Kind="ViewQuilt" />
<!--<TextBlock
--><!--<TextBlock
HorizontalAlignment="Center"
Text="设备端口" />-->
Text="设备端口" />--><!--
</StackPanel>
</TabItem.Header>
</TabItem>
Expand All @@ -159,16 +159,17 @@
Height="28"
HorizontalAlignment="Center"
Kind="ChemicalWeapon" />
<!--<TextBlock
--><!--<TextBlock
HorizontalAlignment="Center"
Text="地址收藏" />-->
Text="地址收藏" />--><!--
</StackPanel>
</TabItem.Header>
</TabItem>
</TabItem>-->

<TabItem
<!--<TabItem
IsEnabled="False"
IsSelected="False"

>
<TabItem.Header>
<StackPanel
Expand All @@ -179,12 +180,12 @@
Height="28"
HorizontalAlignment="Center"
Kind="ViewCarouselOutline" />
<!--<TextBlock
--><!--<TextBlock
HorizontalAlignment="Center"
Text="地址收藏" />-->
Text="地址收藏" />--><!--
</StackPanel>
</TabItem.Header>
</TabItem>
</TabItem>-->
</TabControl>


Expand All @@ -203,7 +204,7 @@
SelectionChanged="BottomControl_OnSelectionChanged"
Style="{StaticResource MaterialDesignNavigationRailTabControl}">

<TabItem
<!--<TabItem
IsSelected="False"

>
Expand All @@ -218,12 +219,12 @@
HorizontalAlignment="Center"
ToolTip="数据预设"
Kind="Devices" />
<!--<TextBlock
--><!--<TextBlock
HorizontalAlignment="Center"
Text="获取帮助" />-->
Text="获取帮助" />--><!--
</StackPanel>
</TabItem.Header>
</TabItem>
</TabItem>-->

<TabItem
IsSelected="False"
Expand Down Expand Up @@ -267,7 +268,7 @@
</TabItem.Header>
</TabItem>

<TabItem>
<!--<TabItem>
<TabItem.Header>
<StackPanel
Width="auto"
Expand All @@ -281,7 +282,7 @@
</StackPanel>
</TabItem.Header>

</TabItem>
</TabItem>-->

<TabItem
IsSelected="False"
Expand Down Expand Up @@ -317,7 +318,7 @@
</TabItem.Header>
</TabItem>

<TabItem
<!--<TabItem
IsSelected="False"
>
<TabItem.Header>
Expand All @@ -335,7 +336,7 @@

</StackPanel>
</TabItem.Header>
</TabItem>
</TabItem>-->
</TabControl>


Expand Down
38 changes: 19 additions & 19 deletions MainWindow.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -344,19 +344,19 @@ private void BottomControl_OnSelectionChanged(object sender, SelectionChangedEve

switch (index)
{
case 0:
//case 0:

DataPreset dataPreset = new DataPreset();
// DataPreset dataPreset = new DataPreset();

dataPreset.Style = (Style)FindResource("DataPresetStyle");
// dataPreset.Style = (Style)FindResource("DataPresetStyle");

FunctionPanel.Children.Add(dataPreset);
// FunctionPanel.Children.Add(dataPreset);

break;
// break;



case 1:
case 0:

DatabaseBackup databaseBackup = new DatabaseBackup();

Expand All @@ -365,7 +365,7 @@ private void BottomControl_OnSelectionChanged(object sender, SelectionChangedEve
FunctionPanel.Children.Add(databaseBackup);
break;

case 2:
case 1:



Expand All @@ -378,17 +378,17 @@ private void BottomControl_OnSelectionChanged(object sender, SelectionChangedEve

break;

case 3:
DonationPage donationPage = new DonationPage();
//case 3:
// DonationPage donationPage = new DonationPage();

donationPage.Style = (Style)FindResource("DonationStyle");
// donationPage.Style = (Style)FindResource("DonationStyle");

FunctionPanel.Children.Add(donationPage);
// FunctionPanel.Children.Add(donationPage);

break;
// break;


case 4:
case 2:



Expand All @@ -402,18 +402,18 @@ private void BottomControl_OnSelectionChanged(object sender, SelectionChangedEve
break;


case 5:
//case 5:



HumanGreeting humanGreeting = new HumanGreeting();
// HumanGreeting humanGreeting = new HumanGreeting();

humanGreeting.Style = (Style)FindResource("HumanGreetingStyle");
// humanGreeting.Style = (Style)FindResource("HumanGreetingStyle");

FunctionPanel.Children.Add(humanGreeting);
// FunctionPanel.Children.Add(humanGreeting);


break;
// break;
}

}
Expand All @@ -426,7 +426,7 @@ private void BottomControl_OnSelectionChanged(object sender, SelectionChangedEve
private void AboutButton_OnClick(object sender, RoutedEventArgs e)
{
FunctionPanel.Children.Clear();
BottomControl.SelectedIndex = 4;
BottomControl.SelectedIndex = 2;
BottomControl_OnSelectionChanged(null,null);

//About aboutPage = new About();
Expand Down
20 changes: 16 additions & 4 deletions UserPages/About.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,11 @@



<TextBlock
FontSize="16"
Margin="0,10"
Style="{StaticResource MaterialDesignSubtitle2TextBlock}"
Text="修改：广广（只是对某些控件进行了注释）" />


<TextBlock
Expand All @@ -100,14 +105,21 @@
FontSize="16"
MouseDown="IpamNote_OnMouseDown"
Style="{StaticResource MaterialDesignSubtitle2TextBlock}"
Text="Github主页：https://github.com/yaobus/IPAM-NOTE.git" />
Text="原作者Github主页：https://github.com/yaobus/IPAM-NOTE.git" />

<TextBlock

<!--<TextBlock
Margin="0,10"
FontSize="16"
Style="{StaticResource MaterialDesignSubtitle2TextBlock}"
Text="BUG反馈QQ群：957648723" />
Text="BUG反馈QQ群：957648723" />-->

<TextBlock
Margin="0,10"
FontSize="16"
MouseDown="IpamNote_OnMouseDown"
Style="{StaticResource MaterialDesignSubtitle2TextBlock}"
Text="修改者Github主页：https://github.com/lovelace545/IPAM-NOTE.git" />

</StackPanel>

Expand Down Expand Up @@ -179,7 +191,7 @@
<TextBlock
Margin="0,10"
Style="{StaticResource MaterialDesignHeadline4TextBlock}"
Text="特别鸣谢" />
Text="特别鸣谢!" />

<TextBlock
Margin="0,10"
Expand Down