[update] 存儲設置和截圖設置已適配設置面板導航行為
This commit is contained in:
parent
51aae53725
commit
75abf73089
@ -8699,6 +8699,40 @@
|
||||
</Image>
|
||||
</Grid>
|
||||
</Border>
|
||||
<Border Name="SettingsStorageJumpToGroupBoxButton"
|
||||
MouseDown="SettingsJumpToGroupBox_MouseDown" BorderBrush="#3b82f6"
|
||||
BorderThickness="0,0,0,0" Width="50" Height="50">
|
||||
<Grid>
|
||||
<Image Height="28" Width="28">
|
||||
<Image.Source>
|
||||
<DrawingImage >
|
||||
<DrawingImage.Drawing>
|
||||
<DrawingGroup ClipGeometry="M0,0 V24 H24 V0 H0 Z">
|
||||
<GeometryDrawing Brush="#FFFFFFFF" Geometry="F0 M24,24z M0,0z M6.0798,3.17643C7.68668,2.57385 9.81582,2.25 12,2.25 14.1842,2.25 16.3133,2.57385 17.9202,3.17643 18.7225,3.47728 19.4021,3.85027 19.8944,4.29596 20.3864,4.7414 20.75,5.31783 20.75,6L20.75,12 20.75,18C20.75,18.6822 20.3864,19.2586 19.8944,19.704 19.4021,20.1497 18.7225,20.5227 17.9202,20.8236 16.3133,21.4261 14.1842,21.75 12,21.75 9.81582,21.75 7.68668,21.4261 6.0798,20.8236 5.27753,20.5227 4.5979,20.1497 4.10561,19.704 3.61358,19.2586 3.25,18.6822 3.25,18L3.25,12 3.25,6C3.25,5.31783 3.61358,4.7414 4.10561,4.29596 4.5979,3.85027 5.27753,3.47728 6.0798,3.17643z M4.75,14.1841L4.75,18C4.75,18.1135 4.80785,18.3164 5.11232,18.5921 5.41653,18.8675 5.90847,19.1573 6.60649,19.4191 8.00019,19.9417 9.94071,20.25 12,20.25 14.0593,20.25 15.9998,19.9417 17.3935,19.4191 18.0915,19.1573 18.5835,18.8675 18.8877,18.5921 19.1922,18.3164 19.25,18.1135 19.25,18L19.25,14.1841C18.8636,14.4248 18.4152,14.6379 17.9202,14.8236 16.3133,15.4261 14.1842,15.75 12,15.75 9.81582,15.75 7.68668,15.4261 6.0798,14.8236 5.58478,14.6379 5.13644,14.4248 4.75,14.1841z M19.25,12L19.25,8.18414C18.8636,8.42484 18.4152,8.63793 17.9202,8.82357 16.3133,9.42615 14.1842,9.75 12,9.75 9.81582,9.75 7.68668,9.42615 6.0798,8.82357 5.58478,8.63793 5.13644,8.42484 4.75,8.18414L4.75,12C4.75,12.1135 4.80785,12.3164 5.11232,12.5921 5.41653,12.8675 5.90847,13.1573 6.60649,13.4191 8.00019,13.9417 9.94071,14.25 12,14.25 14.0593,14.25 15.9998,13.9417 17.3935,13.4191 18.0915,13.1573 18.5835,12.8675 18.8877,12.5921 19.1922,12.3164 19.25,12.1135 19.25,12z M5.11232,6.59206C4.80785,6.3164 4.75,6.11348 4.75,6 4.75,5.88652 4.80784,5.6836 5.11232,5.40794 5.41653,5.13253 5.90847,4.84268 6.60649,4.58093 8.00019,4.05829 9.94071,3.75 12,3.75 14.0593,3.75 15.9998,4.05829 17.3935,4.58093 18.0915,4.84268 18.5835,5.13253 18.8877,5.40794 19.1922,5.6836 19.25,5.88652 19.25,6 19.25,6.11348 19.1922,6.3164 18.8877,6.59206 18.5835,6.86747 18.0915,7.15732 17.3935,7.41907 15.9998,7.94171 14.0593,8.25 12,8.25 9.94071,8.25 8.00019,7.94171 6.60649,7.41907 5.90847,7.15732 5.41653,6.86747 5.11232,6.59206z" />
|
||||
</DrawingGroup>
|
||||
</DrawingImage.Drawing>
|
||||
</DrawingImage>
|
||||
</Image.Source>
|
||||
</Image>
|
||||
</Grid>
|
||||
</Border>
|
||||
<Border Name="SettingsSnapshotJumpToGroupBoxButton"
|
||||
MouseDown="SettingsJumpToGroupBox_MouseDown" BorderBrush="#3b82f6"
|
||||
BorderThickness="0,0,0,0" Width="50" Height="50">
|
||||
<Grid>
|
||||
<Image Height="28" Width="28">
|
||||
<Image.Source>
|
||||
<DrawingImage>
|
||||
<DrawingImage.Drawing>
|
||||
<DrawingGroup ClipGeometry="M0,0 V24 H24 V0 H0 Z">
|
||||
<GeometryDrawing Brush="#FFFFFFFF" Geometry="F0 M24,24z M0,0z M6,4.75C5.66848,4.75 5.35054,4.8817 5.11612,5.11612 4.8817,5.35054 4.75,5.66848 4.75,6L4.75,8C4.75,8.41421 4.41421,8.75 4,8.75 3.58579,8.75 3.25,8.41421 3.25,8L3.25,6C3.25,5.27065 3.53973,4.57118 4.05546,4.05546 4.57118,3.53973 5.27065,3.25 6,3.25L8,3.25C8.41421,3.25 8.75,3.58579 8.75,4 8.75,4.41421 8.41421,4.75 8,4.75L6,4.75z M14.25,8C14.25,7.58579,14.5858,7.25,15,7.25L15.01,7.25C15.4242,7.25 15.76,7.58579 15.76,8 15.76,8.41421 15.4242,8.75 15.01,8.75L15,8.75C14.5858,8.75,14.25,8.41421,14.25,8z M9.5,10.751C9.43956,10.751 9.3797,10.7629 9.32387,10.786 9.26803,10.8092 9.2173,10.8431 9.17458,10.8859L9.17433,10.8861 6.53033,13.5301C6.23744,13.823 5.76256,13.823 5.46967,13.5301 5.17678,13.2372 5.17678,12.7623 5.46967,12.4694L8.11342,9.8257 8.11354,9.82557 8.11367,9.82545C8.29564,9.64337 8.51171,9.49892 8.74952,9.40035 8.98743,9.30173 9.24245,9.25098 9.5,9.25098 9.75755,9.25098 10.0126,9.30173 10.2505,9.40035 10.4883,9.49892 10.7044,9.64337 10.8863,9.82545L10.8865,9.82557 10.8866,9.8257 13,11.9391 14.1134,10.8257 14.1135,10.8256 14.1137,10.8254C14.2956,10.6434 14.5117,10.4989 14.7495,10.4003 14.9874,10.3017 15.2425,10.251 15.5,10.251 15.7575,10.251 16.0126,10.3017 16.2505,10.4003 16.4883,10.4989 16.7044,10.6434 16.8863,10.8254L16.8866,10.8257 18.5303,12.4694C18.8232,12.7623 18.8232,13.2372 18.5303,13.5301 18.2374,13.823 17.7626,13.823 17.4697,13.5301L15.8257,11.8861 15.8254,11.8859C15.7827,11.8431 15.732,11.8092 15.6761,11.786 15.6203,11.7629 15.5604,11.751 15.5,11.751 15.4396,11.751 15.3797,11.7629 15.3239,11.786 15.268,11.8092 15.2173,11.8431 15.1746,11.8859L15.1743,11.8861 14.0607,12.9998 14.5303,13.4694C14.8232,13.7623 14.8232,14.2372 14.5303,14.5301 14.2374,14.823 13.7626,14.823 13.4697,14.5301L12.4697,13.5301 9.82567,10.8861 9.82542,10.8859C9.7827,10.8431 9.73197,10.8092 9.67613,10.786 9.6203,10.7629 9.56044,10.751 9.5,10.751z M4.75,16C4.75,15.5858 4.41421,15.25 4,15.25 3.58579,15.25 3.25,15.5858 3.25,16L3.25,18C3.25,18.7293 3.53973,19.4288 4.05546,19.9445 4.57118,20.4603 5.27065,20.75 6,20.75L8,20.75C8.41421,20.75 8.75,20.4142 8.75,20 8.75,19.5858 8.41421,19.25 8,19.25L6,19.25C5.66848,19.25 5.35054,19.1183 5.11612,18.8839 4.8817,18.6495 4.75,18.3315 4.75,18L4.75,16z M15.25,4C15.25,3.58579,15.5858,3.25,16,3.25L18,3.25C18.7293,3.25 19.4288,3.53973 19.9445,4.05546 20.4603,4.57118 20.75,5.27065 20.75,6L20.75,8C20.75,8.41421 20.4142,8.75 20,8.75 19.5858,8.75 19.25,8.41421 19.25,8L19.25,6C19.25,5.66848 19.1183,5.35054 18.8839,5.11612 18.6495,4.8817 18.3315,4.75 18,4.75L16,4.75C15.5858,4.75,15.25,4.41421,15.25,4z M20.75,16C20.75,15.5858 20.4142,15.25 20,15.25 19.5858,15.25 19.25,15.5858 19.25,16L19.25,18C19.25,18.3315 19.1183,18.6495 18.8839,18.8839 18.6495,19.1183 18.3315,19.25 18,19.25L16,19.25C15.5858,19.25 15.25,19.5858 15.25,20 15.25,20.4142 15.5858,20.75 16,20.75L18,20.75C18.7293,20.75 19.4288,20.4603 19.9445,19.9445 20.4603,19.4288 20.75,18.7293 20.75,18L20.75,16z" />
|
||||
</DrawingGroup>
|
||||
</DrawingImage.Drawing>
|
||||
</DrawingImage>
|
||||
</Image.Source>
|
||||
</Image>
|
||||
</Grid>
|
||||
</Border>
|
||||
<Border Name="SettingsRandWindowJumpToGroupBoxButton"
|
||||
MouseDown="SettingsJumpToGroupBox_MouseDown" BorderBrush="#3b82f6"
|
||||
BorderThickness="0,0,0,0" Width="50" Height="50">
|
||||
|
||||
@ -1967,6 +1967,8 @@ namespace Ink_Canvas {
|
||||
SettingsPPTGroupBox,
|
||||
SettingsAdvancedGroupBox,
|
||||
SettingsAutomationGroupBox,
|
||||
SettingsStorageGroupBox,
|
||||
SettingsSnapshotGroupBox,
|
||||
SettingsRandWindowGroupBox,
|
||||
SettingsAboutGroupBox
|
||||
};
|
||||
@ -1980,6 +1982,8 @@ namespace Ink_Canvas {
|
||||
SettingsPPTJumpToGroupBoxButton,
|
||||
SettingsAdvancedJumpToGroupBoxButton,
|
||||
SettingsAutomationJumpToGroupBoxButton,
|
||||
SettingsStorageJumpToGroupBoxButton,
|
||||
SettingsSnapshotJumpToGroupBoxButton,
|
||||
SettingsRandWindowJumpToGroupBoxButton,
|
||||
SettingsAboutJumpToGroupBoxButton
|
||||
};
|
||||
|
||||
@ -270,10 +270,21 @@ namespace Ink_Canvas {
|
||||
}
|
||||
|
||||
|
||||
private DirectoryInfo GetDirectoryBySettings() {
|
||||
var si = Settings.Storage.StorageLocation;
|
||||
throw new NotImplementedException();
|
||||
return new DirectoryInfo("");
|
||||
private DirectoryInfo GetDirectory(string type) {
|
||||
if (Settings.Storage.StorageLocation.Substring(0, 1) != "c") {
|
||||
var autoSavedInkPath = new DirectoryInfo(storageLocationItems[ComboBoxStoragePath.SelectedIndex].Path+"\\AutoSavedInk");
|
||||
var autoSavedSnapshotPath = new DirectoryInfo(storageLocationItems[ComboBoxStoragePath.SelectedIndex].Path+"\\AutoSavedSnapshot");
|
||||
var exportedInkPath = new DirectoryInfo(storageLocationItems[ComboBoxStoragePath.SelectedIndex].Path+"\\ExportedInk");
|
||||
var quotedPhotosPath = new DirectoryInfo(storageLocationItems[ComboBoxStoragePath.SelectedIndex].Path+"\\QuotedPhotos");
|
||||
var cachesPath = new DirectoryInfo(storageLocationItems[ComboBoxStoragePath.SelectedIndex].Path+"\\caches");
|
||||
if (type == "autosaveink") return autoSavedInkPath;
|
||||
else if (type == "autosavesnapshot") return autoSavedSnapshotPath;
|
||||
else if (type == "exportedink") return exportedInkPath;
|
||||
else if (type == "quotedphotos") return quotedPhotosPath;
|
||||
else if (type == "caches") return cachesPath;
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
private DirectoryInfo GetDirectoryInfoByIndex(int index) {
|
||||
|
||||
Loading…
Reference in New Issue
Block a user