Skip to content
This repository was archived by the owner on Sep 1, 2022. It is now read-only.

Commit 7cab9e4

Browse files
author
Alexander Fuks
committed
Undo MahApps Metro update due to issues
1 parent d77d973 commit 7cab9e4

File tree

5 files changed

+17
-17
lines changed

5 files changed

+17
-17
lines changed

‎BusinessAccounting/BusinessAccounting/BusinessAccounting.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,8 @@
6969
<HintPath>..\packages\Google.Apis.1.25.0\lib\net45\Google.Apis.PlatformServices.dll</HintPath>
7070
<Private>True</Private>
7171
</Reference>
72-
<Reference Include="MahApps.Metro, Version=1.5.0.23, Culture=neutral, PublicKeyToken=f4fb5a3c4d1e5b4f, processorArchitecture=MSIL">
73-
<HintPath>..\packages\MahApps.Metro.1.5.0\lib\net45\MahApps.Metro.dll</HintPath>
72+
<Reference Include="MahApps.Metro, Version=0.14.0.0, Culture=neutral, PublicKeyToken=f4fb5a3c4d1e5b4f, processorArchitecture=MSIL">
73+
<HintPath>..\packages\MahApps.Metro.0.14.0.0\lib\net45\MahApps.Metro.dll</HintPath>
7474
<Private>True</Private>
7575
</Reference>
7676
<Reference Include="MySql.Data, Version=6.9.9.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
@@ -95,7 +95,7 @@
9595
<Reference Include="System.Windows.Forms" />
9696
<Reference Include="System.Windows.Forms.DataVisualization" />
9797
<Reference Include="System.Windows.Interactivity, Version=4.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
98-
<HintPath>..\packages\MahApps.Metro.1.5.0\lib\net45\System.Windows.Interactivity.dll</HintPath>
98+
<HintPath>..\packages\MahApps.Metro.0.14.0.0\lib\net45\System.Windows.Interactivity.dll</HintPath>
9999
<Private>True</Private>
100100
</Reference>
101101
<Reference Include="System.Xaml">

‎BusinessAccounting/BusinessAccounting/UserControls/CashPage.xaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -101,13 +101,13 @@
101101
</Grid.ColumnDefinitions>
102102

103103
<Label Grid.Row="0" Content="Дата" VerticalContentAlignment="Center" HorizontalContentAlignment="Right" />
104-
<DatePicker Grid.Row="0" Grid.Column="1" controls:TextBoxHelper.Watermark="Выберите дату" Name="InputDate" SelectedDateFormat="Short" SelectedDate="{Binding DefaultInputDate, Mode=OneWay}" IsTodayHighlighted="True"/>
104+
<DatePicker Grid.Row="0" Grid.Column="1" controls:TextboxHelper.Watermark="Выберите дату" Name="InputDate" SelectedDateFormat="Short" SelectedDate="{Binding DefaultInputDate, Mode=OneWay}" IsTodayHighlighted="True"/>
105105

106106
<Label Grid.Row="1" Grid.Column="0" Content="Сумма" VerticalContentAlignment="Center" HorizontalContentAlignment="Right" />
107-
<TextBox Grid.Row="1" Grid.Column="1" controls:TextBoxHelper.Watermark="Введите сумму" controls:TextBoxHelper.ClearTextButton="True" Name="InputSum"/>
107+
<TextBox Grid.Row="1" Grid.Column="1" controls:TextboxHelper.Watermark="Введите сумму" controls:TextboxHelper.ClearTextButton="True" Name="InputSum"/>
108108

109109
<Label Grid.Row="2" Grid.Column="0" Content="Комментарий" VerticalContentAlignment="Center" HorizontalContentAlignment="Right" />
110-
<TextBox Grid.Row="2" Grid.Column="1" controls:TextBoxHelper.Watermark="Введите комментарий&#x0a;для записи (опционально)" controls:TextBoxHelper.ClearTextButton="True" VerticalScrollBarVisibility="Auto" AcceptsReturn="True" AutoWordSelection="True" TextWrapping="Wrap" Name="InputComment"/>
110+
<TextBox Grid.Row="2" Grid.Column="1" controls:TextboxHelper.Watermark="Введите комментарий&#x0a;для записи (опционально)" controls:TextboxHelper.ClearTextButton="True" VerticalScrollBarVisibility="Auto" AcceptsReturn="True" AutoWordSelection="True" TextWrapping="Wrap" Name="InputComment"/>
111111

112112
<Label Grid.Row="3" Grid.Column="0" Content="Режим зарплаты" VerticalContentAlignment="Center" HorizontalContentAlignment="Right" />
113113
<controls:ToggleSwitch Grid.Row="3" Grid.Column="1" OnLabel="" OffLabel="" Name="SalaryMode" Margin="0,5" HorizontalAlignment="Left"/>

‎BusinessAccounting/BusinessAccounting/UserControls/EmployeePage.xaml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -89,25 +89,25 @@
8989
</Grid.RowDefinitions>
9090

9191
<Label Grid.Row="0" Grid.Column="0" Content="Принят" HorizontalAlignment="Right" VerticalAlignment="Center"/>
92-
<DatePicker Grid.Row="0" Grid.Column="1" controls:TextBoxHelper.Watermark="Выберите дату" SelectedDateFormat="Short" SelectedDate="{Binding Path=Hired}" IsEnabled="False" Name="PickerHiredDate" IsTodayHighlighted="True"/>
92+
<DatePicker Grid.Row="0" Grid.Column="1" controls:TextboxHelper.Watermark="Выберите дату" SelectedDateFormat="Short" SelectedDate="{Binding Path=Hired}" IsEnabled="False" Name="PickerHiredDate" IsTodayHighlighted="True"/>
9393

9494
<Label Grid.Row="0" Grid.Column="2" Content="Уволен" HorizontalAlignment="Right" VerticalAlignment="Center"/>
95-
<DatePicker Grid.Row="0" Grid.Column="3" controls:TextBoxHelper.Watermark="Выберите дату" SelectedDateFormat="Short" SelectedDate="{Binding Path=Fired}" IsEnabled="False" Name="PickerFiredDate" IsTodayHighlighted="True"/>
95+
<DatePicker Grid.Row="0" Grid.Column="3" controls:TextboxHelper.Watermark="Выберите дату" SelectedDateFormat="Short" SelectedDate="{Binding Path=Fired}" IsEnabled="False" Name="PickerFiredDate" IsTodayHighlighted="True"/>
9696

9797
<Label Grid.Row="1" Grid.Column="0" Content="Фамилия, имя, отчество" HorizontalAlignment="Right" VerticalAlignment="Center"/>
98-
<TextBox Grid.Row="1" Grid.Column="1" Grid.ColumnSpan="3" IsReadOnly="True" controls:TextBoxHelper.Watermark="Введите фамилию, имя и отчество сотрудника" controls:TextBoxHelper.ClearTextButton="{Binding RelativeSource={RelativeSource Self}, Path=IsReadOnly, Converter={StaticResource InverseBooleanConverter}}" Name="InputEmplName" Text="{Binding Path=FullName}"/>
98+
<TextBox Grid.Row="1" Grid.Column="1" Grid.ColumnSpan="3" IsReadOnly="True" controls:TextboxHelper.Watermark="Введите фамилию, имя и отчество сотрудника" controls:TextboxHelper.ClearTextButton="{Binding RelativeSource={RelativeSource Self}, Path=IsReadOnly, Converter={StaticResource InverseBooleanConverter}}" Name="InputEmplName" Text="{Binding Path=FullName}"/>
9999

100100
<Label Grid.Row="2" Grid.Column="0" Content="Номер телефона" HorizontalAlignment="Right" VerticalAlignment="Center"/>
101-
<TextBox Grid.Row="2" Grid.Column="1" Grid.ColumnSpan="3" IsReadOnly="True" controls:TextBoxHelper.Watermark="Введите контактный номер телефона" controls:TextBoxHelper.ClearTextButton="{Binding RelativeSource={RelativeSource Self}, Path=IsReadOnly, Converter={StaticResource InverseBooleanConverter}}" Name="InputEmplPhone" Text="{Binding Path=Telephone}"/>
101+
<TextBox Grid.Row="2" Grid.Column="1" Grid.ColumnSpan="3" IsReadOnly="True" controls:TextboxHelper.Watermark="Введите контактный номер телефона" controls:TextboxHelper.ClearTextButton="{Binding RelativeSource={RelativeSource Self}, Path=IsReadOnly, Converter={StaticResource InverseBooleanConverter}}" Name="InputEmplPhone" Text="{Binding Path=Telephone}"/>
102102

103103
<Label Grid.Row="3" Grid.Column="0" Content="Паспортные данные" HorizontalAlignment="Right" VerticalAlignment="Center"/>
104-
<TextBox Grid.Row="3" Grid.Column="1" Grid.ColumnSpan="3" IsReadOnly="True" controls:TextBoxHelper.Watermark="Введите паспортные данные" controls:TextBoxHelper.ClearTextButton="{Binding RelativeSource={RelativeSource Self}, Path=IsReadOnly, Converter={StaticResource InverseBooleanConverter}}" VerticalScrollBarVisibility="Auto" AcceptsReturn="True" AutoWordSelection="True" TextWrapping="Wrap" Name="InputEmplPassport" Text="{Binding Path=Document}"/>
104+
<TextBox Grid.Row="3" Grid.Column="1" Grid.ColumnSpan="3" IsReadOnly="True" controls:TextboxHelper.Watermark="Введите паспортные данные" controls:TextboxHelper.ClearTextButton="{Binding RelativeSource={RelativeSource Self}, Path=IsReadOnly, Converter={StaticResource InverseBooleanConverter}}" VerticalScrollBarVisibility="Auto" AcceptsReturn="True" AutoWordSelection="True" TextWrapping="Wrap" Name="InputEmplPassport" Text="{Binding Path=Document}"/>
105105

106106
<Label Grid.Row="4" Grid.Column="0" Content="Адрес проживания" HorizontalAlignment="Right" VerticalAlignment="Center"/>
107-
<TextBox Grid.Row="4" Grid.Column="1" Grid.ColumnSpan="3" IsReadOnly="True" controls:TextBoxHelper.Watermark="Введите адрес проживания" controls:TextBoxHelper.ClearTextButton="{Binding RelativeSource={RelativeSource Self}, Path=IsReadOnly, Converter={StaticResource InverseBooleanConverter}}" VerticalScrollBarVisibility="Auto" AcceptsReturn="True" AutoWordSelection="True" TextWrapping="Wrap" Name="InputEmplAddress" Text="{Binding Path=Address}"/>
107+
<TextBox Grid.Row="4" Grid.Column="1" Grid.ColumnSpan="3" IsReadOnly="True" controls:TextboxHelper.Watermark="Введите адрес проживания" controls:TextboxHelper.ClearTextButton="{Binding RelativeSource={RelativeSource Self}, Path=IsReadOnly, Converter={StaticResource InverseBooleanConverter}}" VerticalScrollBarVisibility="Auto" AcceptsReturn="True" AutoWordSelection="True" TextWrapping="Wrap" Name="InputEmplAddress" Text="{Binding Path=Address}"/>
108108

109109
<Label Grid.Row="5" Grid.Column="0" Content="Заметки" HorizontalAlignment="Right" VerticalAlignment="Center"/>
110-
<TextBox Grid.Row="5" Grid.Column="1" Grid.ColumnSpan="3" IsReadOnly="True" controls:TextBoxHelper.Watermark="Введите прочие данные" controls:TextBoxHelper.ClearTextButton="{Binding RelativeSource={RelativeSource Self}, Path=IsReadOnly, Converter={StaticResource InverseBooleanConverter}}" VerticalScrollBarVisibility="Auto" AcceptsReturn="True" AutoWordSelection="True" TextWrapping="Wrap" Name="InputEmplNotes" Text="{Binding Path=Notes}"/>
110+
<TextBox Grid.Row="5" Grid.Column="1" Grid.ColumnSpan="3" IsReadOnly="True" controls:TextboxHelper.Watermark="Введите прочие данные" controls:TextboxHelper.ClearTextButton="{Binding RelativeSource={RelativeSource Self}, Path=IsReadOnly, Converter={StaticResource InverseBooleanConverter}}" VerticalScrollBarVisibility="Auto" AcceptsReturn="True" AutoWordSelection="True" TextWrapping="Wrap" Name="InputEmplNotes" Text="{Binding Path=Notes}"/>
111111

112112
<Grid Grid.Row="6" Grid.Column="1" Grid.ColumnSpan="3">
113113
<Grid.RowDefinitions>
@@ -184,7 +184,7 @@
184184
</Grid.ColumnDefinitions>
185185

186186
<Label Grid.Row="0" Grid.Column="0" Content="Данные для поиска" HorizontalAlignment="Right"/>
187-
<TextBox Grid.Row="0" Grid.Column="1" controls:TextBoxHelper.Watermark="Введите данные" controls:TextBoxHelper.ClearTextButton="True" Name="InputSearchData" TextChanged="InputSearchData_OnTextChanged"/>
187+
<TextBox Grid.Row="0" Grid.Column="1" controls:TextboxHelper.Watermark="Введите данные" controls:TextboxHelper.ClearTextButton="True" Name="InputSearchData" TextChanged="InputSearchData_OnTextChanged"/>
188188

189189
<Label Grid.Row="1" Grid.Column="0" Content="Только активные" HorizontalAlignment="Right" VerticalContentAlignment="Center"/>
190190
<controls:ToggleSwitch Grid.Row="1" Grid.Column="1" Name="CheckBoxOnlyActive" Margin="0,5" HorizontalAlignment="Left" OnLabel="" OffLabel="" IsChecked="true" IsCheckedChanged="CheckBoxOnlyActive_OnIsCheckedChanged"/>

‎BusinessAccounting/BusinessAccounting/UserControls/GraphicsPage.xaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,9 +75,9 @@
7575
</ComboBox>
7676

7777
<Label Grid.Row="1" Grid.Column="0" Content="Период / год" HorizontalAlignment="Right"/>
78-
<DatePicker Grid.Row="1" Grid.Column="1" controls:TextBoxHelper.Watermark="Начальная дата" Name="PickerPeriodStart" SelectedDateFormat="Short" SelectedDate="{Binding DefaultStartDate, Mode=OneWay}" IsTodayHighlighted="True"/>
78+
<DatePicker Grid.Row="1" Grid.Column="1" controls:TextboxHelper.Watermark="Начальная дата" Name="PickerPeriodStart" SelectedDateFormat="Short" SelectedDate="{Binding DefaultStartDate, Mode=OneWay}" IsTodayHighlighted="True"/>
7979

80-
<DatePicker Grid.Row="2" Grid.Column="1" controls:TextBoxHelper.Watermark="Конечная дата" Name="PickerPeriodEnd" SelectedDateFormat="Short" SelectedDate="{Binding DefaultEndDate, Mode=OneWay}" IsEnabled="{Binding ElementName=ComboChart, Path=SelectedIndex, Converter={StaticResource IndexToBooleanConverter}}" IsTodayHighlighted="True"/>
80+
<DatePicker Grid.Row="2" Grid.Column="1" controls:TextboxHelper.Watermark="Конечная дата" Name="PickerPeriodEnd" SelectedDateFormat="Short" SelectedDate="{Binding DefaultEndDate, Mode=OneWay}" IsEnabled="{Binding ElementName=ComboChart, Path=SelectedIndex, Converter={StaticResource IndexToBooleanConverter}}" IsTodayHighlighted="True"/>
8181

8282
<Label Grid.Row="3" Grid.Column="0" Content="Показывать значения" VerticalContentAlignment="Center" HorizontalContentAlignment="Right"/>
8383
<controls:ToggleSwitch Grid.Row="3" Grid.Column="1" OnLabel="" OffLabel="" Name="ComboDisplayValues" Margin="0,5" HorizontalAlignment="Left" ToolTip="Отображать значение каждой точки графика" IsChecked="True"/>

‎BusinessAccounting/BusinessAccounting/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<package id="Google.Apis.Auth" version="1.25.0" targetFramework="net461" />
55
<package id="Google.Apis.Core" version="1.25.0" targetFramework="net461" />
66
<package id="Google.Apis.Drive.v3" version="1.25.0.848" targetFramework="net461" />
7-
<package id="MahApps.Metro" version="1.5.0" targetFramework="net461" />
7+
<package id="MahApps.Metro" version="0.14.0.0" targetFramework="net461" />
88
<package id="MySql.Data" version="6.9.9" targetFramework="net461" />
99
<package id="Newtonsoft.Json" version="7.0.1" targetFramework="net461" />
1010
<package id="System.Data.SQLite.Core" version="1.0.104.0" targetFramework="net461" />

0 commit comments

Comments
 (0)