...
 
Commits (20)
......@@ -1421,11 +1421,12 @@ apps_changed (GAppInfoMonitor *monitor,
}
static void
row_selected_cb (GtkListBox *list,
row_activated_cb (GtkListBox *list,
GtkListBoxRow *row,
CcApplicationsPanel *self)
{
update_panel (self, row);
g_signal_emit_by_name (self, "sidebar-activated");
}
static void
......@@ -1653,8 +1654,8 @@ cc_applications_panel_init (CcApplicationsPanel *self)
provider,
GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
g_signal_connect (self->sidebar_listbox, "row-selected",
G_CALLBACK (row_selected_cb), self);
g_signal_connect (self->sidebar_listbox, "row-activated",
G_CALLBACK (row_activated_cb), self);
g_signal_connect (self->header_button, "clicked", G_CALLBACK (open_software_cb), self);
......
......@@ -183,7 +183,6 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="label_xalign">0</property>
<property name="shadow_type">in</property>
<child>
......@@ -191,7 +190,6 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="selection_mode">none</property>
<signal name="keynav-failed" handler="keynav_failed" object="CcNotificationsPanel" swapped="yes" />
<signal name="row-activated" handler="select_app" object="CcNotificationsPanel" swapped="yes" />
......
......@@ -88,7 +88,7 @@
<property name="hexpand">True</property>
<child>
<object class="GtkLabel">
<object class="GtkLabel" id="accounts_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="wrap">True</property>
......@@ -98,6 +98,9 @@
<attributes>
<attribute name="scale" value="1.66" />
</attributes>
<accessibility>
<relation target="accounts_listbox" type="label-for"/>
</accessibility>
</object>
</child>
<child>
......@@ -117,12 +120,15 @@
<property name="can_focus">True</property>
<property name="selection_mode">none</property>
<signal name="row-activated" handler="on_listbox_row_activated" object="CcGoaPanel" swapped="yes" />
<accessibility>
<relation target="accounts_label" type="labelled-by"/>
</accessibility>
</object>
</child>
</object>
</child>
<child>
<object class="GtkLabel">
<object class="GtkLabel" id="providers_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin-top">20</property>
......@@ -131,6 +137,9 @@
<attributes>
<attribute name="weight" value="bold" />
</attributes>
<accessibility>
<relation target="providers_listbox" type="label-for"/>
</accessibility>
</object>
</child>
<child>
......@@ -143,6 +152,9 @@
<property name="can_focus">True</property>
<property name="selection_mode">none</property>
<signal name="row-activated" handler="on_provider_row_activated" object="CcGoaPanel" swapped="yes" />
<accessibility>
<relation target="providers_label" type="labelled-by"/>
</accessibility>
<child>
<object class="GtkListBoxRow" id="more_providers_row">
<property name="visible">True</property>
......
......@@ -1538,6 +1538,7 @@
<property name="hexpand">True</property>
<property name="adjustment">repeat_delay_adjustment</property>
<property name="draw_value">False</property>
<property name="has_origin">False</property>
<property name="width-request">400</property>
<child internal-child="accessible">
<object class="AtkObject" id="repeat_delay_scale-atkobject">
......@@ -1623,6 +1624,8 @@
<property name="hexpand">True</property>
<property name="adjustment">repeat_speed_adjustment</property>
<property name="draw_value">False</property>
<property name="has_origin">False</property>
<property name="inverted">True</property>
<property name="width-request">200</property>
<child internal-child="accessible">
<object class="AtkObject" id="repeat_speed_scale-atkobject">
......
......@@ -131,9 +131,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="use_action_appearance">False</property>
<accessibility>
<relation type="labelled-by" target="xhairs-section-heading"/>
</accessibility>
</object>
<packing>
<property name="expand">False</property>
......@@ -579,9 +576,6 @@
<property name="use_underline">True</property>
<property name="mnemonic_widget">crosshair_length_slider</property>
<property name="width_chars">12</property>
<accessibility>
<relation type="label-for" target="crosshair_length_slider"/>
</accessibility>
<attributes>
<attribute name="scale" value="1.25"/>
</attributes>
......@@ -719,9 +713,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="use_action_appearance">False</property>
<accessibility>
<relation type="labelled-by" target="xhairs-section-heading"/>
</accessibility>
</object>
<packing>
<property name="expand">False</property>
......@@ -832,9 +823,6 @@
<property name="justify">right</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">inverse_enabled_switch</property>
<accessibility>
<relation type="label-for" target="inverse_enabled_switch"/>
</accessibility>
<attributes>
<attribute name="scale" value="1.25"/>
</attributes>
......@@ -856,9 +844,6 @@
<property name="use_underline">True</property>
<property name="mnemonic_widget">brightness_slider</property>
<property name="width_chars">12</property>
<accessibility>
<relation type="label-for" target="brightness_slider"/>
</accessibility>
<attributes>
<attribute name="scale" value="1.25"/>
</attributes>
......@@ -879,9 +864,6 @@
<property name="justify">right</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">contrast_slider</property>
<accessibility>
<relation type="label-for" target="contrast_slider"/>
</accessibility>
<attributes>
<attribute name="scale" value="1.25"/>
</attributes>
......@@ -902,9 +884,6 @@
<property name="justify">right</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">grayscale_slider</property>
<accessibility>
<relation type="label-for" target="grayscale_slider"/>
</accessibility>
<attributes>
<attribute name="scale" value="1.25"/>
</attributes>
......@@ -993,9 +972,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="use_action_appearance">False</property>
<accessibility>
<relation type="labelled-by" target="xhairs-section-heading"/>
</accessibility>
</object>
<packing>
<property name="expand">False</property>
......
This diff is collapsed.
......@@ -22,8 +22,8 @@ msgstr ""
"Project-Id-Version: gnome-control-center master\n"
"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-control-center/"
"issues\n"
"POT-Creation-Date: 2019-01-08 02:35+0000\n"
"PO-Revision-Date: 2019-01-09 21:26+0900\n"
"POT-Creation-Date: 2019-01-10 16:00+0000\n"
"PO-Revision-Date: 2019-01-11 01:13+0900\n"
"Last-Translator: sicklylife <translation@sicklylife.jp>\n"
"Language-Team: Japanese <gnome-translation@gnome.gr.jp>\n"
"Language: ja\n"
......@@ -1626,7 +1626,7 @@ msgstr "手動"
#: panels/display/cc-night-light-dialog.ui:180
msgid "_Off"
msgstr ""
msgstr "オフ(_O)"
#: panels/display/cc-night-light-dialog.ui:216
msgid "From"
......@@ -1655,7 +1655,7 @@ msgstr "終了"
#: panels/display/cc-night-light-dialog.ui:470
msgid "Color Temperature"
msgstr ""
msgstr "色温度"
#. This is the redshift functionality where we suppress blue light when the sun has gone down
#: panels/display/cc-night-light-dialog.ui:505
......@@ -4166,17 +4166,17 @@ msgstr "元に戻す"
msgid "Connect to your data in the cloud"
msgstr "クラウド上のあなたのデータと接続する"
#: panels/online-accounts/online-accounts.ui:108
#: panels/online-accounts/online-accounts.ui:111
msgid "No internet connection — connect to set up new online accounts"
msgstr ""
"インターネット接続がありません — 新しいオンラインアカウントのセットアップのた"
"めに接続"
#: panels/online-accounts/online-accounts.ui:130
#: panels/online-accounts/online-accounts.ui:136
msgid "Add an account"
msgstr "アカウントの追加"
#: panels/online-accounts/online-accounts.ui:231
#: panels/online-accounts/online-accounts.ui:243
msgid "Remove Account"
msgstr "アカウントの削除"
......@@ -5626,8 +5626,9 @@ msgstr "ソフトウェアの使用統計情報を送信する(_S)"
msgid ""
"Use of the camera allows applications to capture photos and video. Disabling "
"the camera may cause some applications to not function properly."
msgstr "アプリケーションがカメラで写真や動画を撮影できるようになります。"
"無効にすると一部のアプリケーションが正常に動作しなくなる可能性があります。"
msgstr ""
"アプリケーションがカメラで写真や動画を撮影できるようになります。無効にすると"
"一部のアプリケーションが正常に動作しなくなる可能性があります。"
#: panels/privacy/cc-privacy-panel.ui:812
msgid "_Camera"
......@@ -6432,9 +6433,9 @@ msgid ""
"BIOS or is set to an unsupported security level in the BIOS."
msgstr ""
"Thunderbolt を検出できませんでした。\n"
"システムが Thunderbolt に対応していないか、または BIOS で Thunderbolt が"
"無効化されているか、もしくは BIOS で Thunderbolt のセキュリティレベルが対"
"応していない設定になっています。"
"システムが Thunderbolt に対応していないか、または BIOS で Thunderbolt が無効"
"になっているか、もしくは BIOS で Thunderbolt のセキュリティレベルが対応してい"
"ない設定になっているかのいずれかです。"
#: panels/thunderbolt/cc-bolt-panel.c:504
msgid "Thunderbolt support has been disabled in the BIOS."
......@@ -6665,182 +6666,182 @@ msgstr "リピートキー"
msgid "Key presses repeat when key is held down."
msgstr "キーを長押しすると繰り返しキー入力を行う"
#: panels/universal-access/cc-ua-panel.ui:1544
#: panels/universal-access/cc-ua-panel.ui:1545
msgid "Repeat keys delay"
msgstr "リピートキーが行われるまでの時間です"
#: panels/universal-access/cc-ua-panel.ui:1592
#: panels/universal-access/cc-ua-panel.ui:1725
#: panels/universal-access/cc-ua-panel.ui:1593
#: panels/universal-access/cc-ua-panel.ui:1728
msgid "Speed"
msgstr "速度"
#: panels/universal-access/cc-ua-panel.ui:1629
#: panels/universal-access/cc-ua-panel.ui:1632
msgid "Repeat keys speed"
msgstr "押したキーをリピートする際の速さです"
#: panels/universal-access/cc-ua-panel.ui:1653
#: panels/universal-access/cc-ua-panel.ui:1656
msgid "Cursor Blinking"
msgstr "カーソルの点滅"
#: panels/universal-access/cc-ua-panel.ui:1683
#: panels/universal-access/cc-ua-panel.ui:1686
msgid "Cursor blinks in text fields."
msgstr "テキストフィールドでカーソルを点滅させる"
#: panels/universal-access/cc-ua-panel.ui:1762
#: panels/universal-access/cc-ua-panel.ui:1765
msgid "Cursor blinking speed"
msgstr "カーソルが点滅する速さです"
#: panels/universal-access/cc-ua-panel.ui:1798
#: panels/universal-access/cc-ua-panel.ui:1801
msgid "Typing Assist"
msgstr "タイピング支援"
#: panels/universal-access/cc-ua-panel.ui:1837
#: panels/universal-access/cc-ua-panel.ui:1840
msgid "_Sticky Keys"
msgstr "固定キー(_S)"
#: panels/universal-access/cc-ua-panel.ui:1854
#: panels/universal-access/cc-ua-panel.ui:1857
msgid "Treats a sequence of modifier keys as a key combination"
msgstr ""
"修飾キーに続いてキーを押したらそのキーと修飾キーを同時に押したものと扱う"
#: panels/universal-access/cc-ua-panel.ui:1878
#: panels/universal-access/cc-ua-panel.ui:1881
msgid "_Disable if two keys are pressed together"
msgstr "同時に 2 つのキーを押したら無効にする(_D)"
#: panels/universal-access/cc-ua-panel.ui:1896
#: panels/universal-access/cc-ua-panel.ui:1899
msgid "Beep when a _modifier key is pressed"
msgstr "修飾キーを押したらビープ音を鳴らす(_M)"
#: panels/universal-access/cc-ua-panel.ui:1944
#: panels/universal-access/cc-ua-panel.ui:1947
msgid "S_low Keys"
msgstr "スローキー(_L)"
#: panels/universal-access/cc-ua-panel.ui:1961
#: panels/universal-access/cc-ua-panel.ui:1964
msgid "Puts a delay between when a key is pressed and when it is accepted"
msgstr "キーを押下してから入力と認識されるまでに一定の間隔を設定する"
#: panels/universal-access/cc-ua-panel.ui:1994
#: panels/universal-access/cc-ua-panel.ui:2207
#: panels/universal-access/cc-ua-panel.ui:2544
#: panels/universal-access/cc-ua-panel.ui:1997
#: panels/universal-access/cc-ua-panel.ui:2210
#: panels/universal-access/cc-ua-panel.ui:2547
msgid "A_cceptance delay:"
msgstr "認識するまでの間隔(_C):"
#: panels/universal-access/cc-ua-panel.ui:2016
#: panels/universal-access/cc-ua-panel.ui:2019
msgctxt "slow keys delay"
msgid "Short"
msgstr "短い"
#: panels/universal-access/cc-ua-panel.ui:2035
#: panels/universal-access/cc-ua-panel.ui:2038
msgid "Slow keys typing delay"
msgstr "スローキーの入力間隔"
#: panels/universal-access/cc-ua-panel.ui:2050
#: panels/universal-access/cc-ua-panel.ui:2053
msgctxt "slow keys delay"
msgid "Long"
msgstr "長い"
#: panels/universal-access/cc-ua-panel.ui:2077
#: panels/universal-access/cc-ua-panel.ui:2080
msgid "Beep when a key is pr_essed"
msgstr "キーが押されたらビープ音を鳴らす(_E)"
#: panels/universal-access/cc-ua-panel.ui:2094
#: panels/universal-access/cc-ua-panel.ui:2097
msgid "Beep when a key is _accepted"
msgstr "キー入力が受け付けられたらビープ音を鳴らす(_A)"
#: panels/universal-access/cc-ua-panel.ui:2111
#: panels/universal-access/cc-ua-panel.ui:2290
#: panels/universal-access/cc-ua-panel.ui:2114
#: panels/universal-access/cc-ua-panel.ui:2293
msgid "Beep when a key is _rejected"
msgstr "キー入力が拒否されたらビープ音を鳴らす(_R)"
#: panels/universal-access/cc-ua-panel.ui:2157
#: panels/universal-access/cc-ua-panel.ui:2160
msgid "_Bounce Keys"
msgstr "バウンスキー(_B)"
#: panels/universal-access/cc-ua-panel.ui:2174
#: panels/universal-access/cc-ua-panel.ui:2177
msgid "Ignores fast duplicate keypresses"
msgstr "同じキーを繰り返し押した場合は無視する"
#: panels/universal-access/cc-ua-panel.ui:2229
#: panels/universal-access/cc-ua-panel.ui:2232
msgctxt "bounce keys delay"
msgid "Short"
msgstr "短い"
#: panels/universal-access/cc-ua-panel.ui:2248
#: panels/universal-access/cc-ua-panel.ui:2251
msgid "Bounce keys typing delay"
msgstr "バウンスキーの入力間隔"
#: panels/universal-access/cc-ua-panel.ui:2263
#: panels/universal-access/cc-ua-panel.ui:2266
msgctxt "bounce keys delay"
msgid "Long"
msgstr "長い"
#: panels/universal-access/cc-ua-panel.ui:2376
#: panels/universal-access/cc-ua-panel.ui:2379
msgid "_Enable by Keyboard"
msgstr "キーボードから有効化できるようにする(_E)"
#: panels/universal-access/cc-ua-panel.ui:2393
#: panels/universal-access/cc-ua-panel.ui:2396
msgid "Turn accessibility features on and off using the keyboard"
msgstr "アクセシビリティ機能のオン/オフをキーボードで切り替える"
#: panels/universal-access/cc-ua-panel.ui:2457
#: panels/universal-access/cc-ua-panel.ui:2460
msgid "Click Assist"
msgstr "クリック支援"
#: panels/universal-access/cc-ua-panel.ui:2493
#: panels/universal-access/cc-ua-panel.ui:2496
msgid "_Simulated Secondary Click"
msgstr "副ボタンのクリックの代替(_S)"
#: panels/universal-access/cc-ua-panel.ui:2511
#: panels/universal-access/cc-ua-panel.ui:2514
msgid "Trigger a secondary click by holding down the primary button"
msgstr "主ボタンを押したままにすると副ボタンのクリックとみなす"
#: panels/universal-access/cc-ua-panel.ui:2565
#: panels/universal-access/cc-ua-panel.ui:2568
msgctxt "secondary click"
msgid "Short"
msgstr "短い"
#: panels/universal-access/cc-ua-panel.ui:2584
#: panels/universal-access/cc-ua-panel.ui:2587
msgid "Secondary click delay"
msgstr "副ボタンのクリックの間隔"
#: panels/universal-access/cc-ua-panel.ui:2599
#: panels/universal-access/cc-ua-panel.ui:2602
msgctxt "secondary click delay"
msgid "Long"
msgstr "長い"
# See also ja.po of mousetweak
#: panels/universal-access/cc-ua-panel.ui:2656
#: panels/universal-access/cc-ua-panel.ui:2659
msgid "_Hover Click"
msgstr "ホバークリック(_H)"
#: panels/universal-access/cc-ua-panel.ui:2674
#: panels/universal-access/cc-ua-panel.ui:2677
msgid "Trigger a click when the pointer hovers"
msgstr "ポインターの移動を停止したらクリック動作を行う"
#: panels/universal-access/cc-ua-panel.ui:2707
#: panels/universal-access/cc-ua-panel.ui:2710
msgid "D_elay:"
msgstr "認識するまでの間隔(_E):"
#: panels/universal-access/cc-ua-panel.ui:2729
#: panels/universal-access/cc-ua-panel.ui:2732
msgctxt "dwell click delay"
msgid "Short"
msgstr "短い"
#: panels/universal-access/cc-ua-panel.ui:2760
#: panels/universal-access/cc-ua-panel.ui:2763
msgctxt "dwell click delay"
msgid "Long"
msgstr "長い"
#: panels/universal-access/cc-ua-panel.ui:2796
#: panels/universal-access/cc-ua-panel.ui:2799
msgid "Motion _threshold:"
msgstr "ジェスチャーのしきい値(_T):"
#: panels/universal-access/cc-ua-panel.ui:2818
#: panels/universal-access/cc-ua-panel.ui:2821
msgctxt "dwell click threshold"
msgid "Small"
msgstr "小"
#: panels/universal-access/cc-ua-panel.ui:2849
#: panels/universal-access/cc-ua-panel.ui:2852
msgctxt "dwell click threshold"
msgid "Large"
msgstr "大"
......@@ -6921,133 +6922,133 @@ msgstr "右半分"
msgid "Zoom Options"
msgstr "ズームオプション"
#: panels/universal-access/zoom-options.ui:188
#: panels/universal-access/zoom-options.ui:185
msgid "_Magnification:"
msgstr "拡大率(_M):"
#: panels/universal-access/zoom-options.ui:252
#: panels/universal-access/zoom-options.ui:249
msgid "_Follow mouse cursor"
msgstr "マウスカーソルの動きを追う(_F)"
#: panels/universal-access/zoom-options.ui:272
#: panels/universal-access/zoom-options.ui:269
msgid "_Screen part:"
msgstr "拡大部分(_S):"
#: panels/universal-access/zoom-options.ui:334
#: panels/universal-access/zoom-options.ui:331
msgid "Magnifier _extends outside of screen"
msgstr "画面の外側も表示する(_E)"
# 旧来のユーザーのために旧Orcaでの名称を括弧内に併記
#: panels/universal-access/zoom-options.ui:353
#: panels/universal-access/zoom-options.ui:350
msgid "_Keep magnifier cursor centered"
msgstr "カーソルを画面中央にキープする(中央)(_K)"
# 旧来のユーザーのために旧Orcaでの名称を括弧内に併記
#: panels/universal-access/zoom-options.ui:372
#: panels/universal-access/zoom-options.ui:369
msgid "Magnifier cursor _pushes contents around"
msgstr "拡大領域を押し出すように移動する(プッシュ)(_P)"
# 旧来のユーザーのために旧Orcaでの名称を括弧内に併記
#: panels/universal-access/zoom-options.ui:391
#: panels/universal-access/zoom-options.ui:388
msgid "Magnifier cursor moves with _contents"
msgstr "カーソルの動きに拡大領域を移動する (プロポーショナル)(_C)"
#: panels/universal-access/zoom-options.ui:425
#: panels/universal-access/zoom-options.ui:422
msgid "Magnifier Position:"
msgstr "拡大領域の位置:"
#: panels/universal-access/zoom-options.ui:446
#: panels/universal-access/zoom-options.ui:443
msgid "Magnifier"
msgstr "拡大鏡"
#: panels/universal-access/zoom-options.ui:493
#: panels/universal-access/zoom-options.ui:490
msgid "_Thickness:"
msgstr "太さ(_T):"
#: panels/universal-access/zoom-options.ui:519
#: panels/universal-access/zoom-options.ui:516
msgctxt "universal access, thickness"
msgid "Thin"
msgstr "細い"
#: panels/universal-access/zoom-options.ui:551
#: panels/universal-access/zoom-options.ui:548
msgctxt "universal access, thickness"
msgid "Thick"
msgstr "太い"
#: panels/universal-access/zoom-options.ui:577
#: panels/universal-access/zoom-options.ui:574
msgid "_Length:"
msgstr "長さ(_L):"
#. The color of the accessibility crosshair
#: panels/universal-access/zoom-options.ui:629
#: panels/universal-access/zoom-options.ui:623
msgid "Co_lor:"
msgstr "色(_L):"
#: panels/universal-access/zoom-options.ui:693
#: panels/universal-access/zoom-options.ui:687
msgid "_Crosshairs:"
msgstr "照準線(_C):"
#: panels/universal-access/zoom-options.ui:744
#: panels/universal-access/zoom-options.ui:735
msgid "_Overlaps mouse cursor"
msgstr "マウスカーソルに重ねる(_O)"
#: panels/universal-access/zoom-options.ui:782
#: panels/universal-access/zoom-options.ui:773
msgid "Crosshairs"
msgstr "照準線"
#: panels/universal-access/zoom-options.ui:831
#: panels/universal-access/zoom-options.ui:822
msgid "_White on black:"
msgstr "反転(_W):"
#: panels/universal-access/zoom-options.ui:854
#: panels/universal-access/zoom-options.ui:842
msgid "_Brightness:"
msgstr "明るさ(_B):"
#: panels/universal-access/zoom-options.ui:878
#: panels/universal-access/zoom-options.ui:863
msgid "_Contrast:"
msgstr "コントラスト(_C):"
#. The contrast scale goes from Color to None (grayscale)
#: panels/universal-access/zoom-options.ui:901
#: panels/universal-access/zoom-options.ui:883
msgctxt "universal access, contrast"
msgid "Co_lor"
msgstr "色(_L)"
#: panels/universal-access/zoom-options.ui:929
#: panels/universal-access/zoom-options.ui:908
msgctxt "universal access, color"
msgid "None"
msgstr "白黒"
#: panels/universal-access/zoom-options.ui:961
#: panels/universal-access/zoom-options.ui:940
msgctxt "universal access, color"
msgid "Full"
msgstr "カラー"
#: panels/universal-access/zoom-options.ui:1027
#: panels/universal-access/zoom-options.ui:1003
msgctxt "universal access, brightness"
msgid "Low"
msgstr "暗い"
#: panels/universal-access/zoom-options.ui:1060
#: panels/universal-access/zoom-options.ui:1036
msgctxt "universal access, brightness"
msgid "High"
msgstr "明るい"
#: panels/universal-access/zoom-options.ui:1091
#: panels/universal-access/zoom-options.ui:1067
msgctxt "universal access, contrast"
msgid "Low"
msgstr "低い"
#: panels/universal-access/zoom-options.ui:1124
#: panels/universal-access/zoom-options.ui:1100
msgctxt "universal access, contrast"
msgid "High"
msgstr "高い"
#: panels/universal-access/zoom-options.ui:1160
#: panels/universal-access/zoom-options.ui:1136
msgid "Color Effects:"
msgstr "色の設定:"
#: panels/universal-access/zoom-options.ui:1185
#: panels/universal-access/zoom-options.ui:1161
msgid "Color Effects"
msgstr "色の設定"
......@@ -8095,6 +8096,10 @@ msgstr ""
"コントロールセンターは、デスクトップの各種設定を行う GNOME のメインインター"
"フェースです。"
#: shell/appdata/gnome-control-center.appdata.xml.in:21
msgid "The GNOME Project"
msgstr ""
#: shell/cc-application.c:58
msgid "Display version number"
msgstr "バージョン番号を表示する"
......
......@@ -12,12 +12,15 @@
aspects of your desktop.
</p>
</description>
<url type="bugtracker">https://bugzilla.gnome.org/browse.cgi?product=control-center</url>
<url type="bugtracker">https://gitlab.gnome.org/GNOME/gnome-control-center/issues/</url>
<url type="donation">https://www.gnome.org/friends/</url>
<url type="translate">https://wiki.gnome.org/TranslationProject</url>
<update_contact>richard_at_hughsie.com</update_contact>
<project_group>GNOME</project_group>
<launchable type="desktop-id">gnome-control-center.desktop</launchable>
<developer_name>The GNOME Project</developer_name>
<compulsory_for_desktop>GNOME</compulsory_for_desktop>
<kudos>
<kudo>AppMenu</kudo>
<kudo>HiDpiIcon</kudo>
<kudo>HighContrast</kudo>
<kudo>ModernToolkit</kudo>
......
......@@ -53,6 +53,12 @@ typedef struct
G_DEFINE_ABSTRACT_TYPE_WITH_PRIVATE (CcPanel, cc_panel, GTK_TYPE_BIN)
enum
{
SIGNAL_SIDEBAR_ACTIVATED,
SIGNAL_LAST
};
enum
{
PROP_0,
......@@ -61,6 +67,8 @@ enum
N_PROPS
};
static guint signals [SIGNAL_LAST] = { 0 };
static GParamSpec *properties [N_PROPS];
static void
......@@ -152,6 +160,14 @@ cc_panel_class_init (CcPanelClass *klass)
object_class->set_property = cc_panel_set_property;
object_class->finalize = cc_panel_finalize;
signals [SIGNAL_SIDEBAR_ACTIVATED] =
g_signal_new ("sidebar-activated",
G_TYPE_FROM_CLASS (object_class),
G_SIGNAL_RUN_LAST,
0, NULL, NULL,
g_cclosure_marshal_VOID__VOID,
G_TYPE_NONE, 0);
properties[PROP_SHELL] = g_param_spec_object ("shell",
"Shell",
"Shell the Panel resides in",
......
......@@ -33,6 +33,8 @@
#include <gtk/gtk.h>
#include <gdk/gdkkeysyms.h>
#include <gdk/gdkx.h>
#define HANDY_USE_UNSTABLE_API
#include <handy.h>
#include <string.h>
#include <time.h>
......@@ -55,11 +57,13 @@ struct _CcWindow
GtkWidget *stack;
GtkWidget *header;
GtkWidget *header_box;
GtkWidget *main_leaflet;
GtkWidget *list_scrolled;
GtkWidget *panel_headerbar;
GtkWidget *search_scrolled;
GtkWidget *panel_list;
GtkWidget *previous_button;
GtkWidget *back_revealer;
GtkWidget *top_right_box;
GtkWidget *search_button;
GtkWidget *search_bar;
......@@ -69,6 +73,7 @@ struct _CcWindow
char *current_panel_id;
GQueue *previous_panels;
HdyHeaderGroup *header_group;
GtkSizeGroup *header_sizegroup;
GPtrArray *custom_widgets;
......@@ -77,6 +82,8 @@ struct _CcWindow
CcPanel *active_panel;
GSettings *settings;
CcPanelListView previous_list_view;
};
static void cc_shell_iface_init (CcShellInterface *iface);
......@@ -152,6 +159,13 @@ remove_all_custom_widgets (CcWindow *self)
CC_EXIT;
}
static void
on_sidebar_activated_cb (CcPanel *panel,
CcWindow *self)
{
hdy_leaflet_set_visible_child_name (HDY_LEAFLET (self->main_leaflet), "panel");
}
static gboolean
activate_panel (CcWindow *self,
const gchar *id,
......@@ -183,6 +197,8 @@ activate_panel (CcWindow *self,
/* Begin the profile */
g_timer_start (timer);
if (self->current_panel)
g_signal_handlers_disconnect_by_data (self->current_panel, self);
self->current_panel = GTK_WIDGET (cc_panel_loader_load_by_name (CC_SHELL (self), id, parameters));
cc_shell_set_active_panel (CC_SHELL (self), CC_PANEL (self->current_panel));
gtk_widget_show (self->current_panel);
......@@ -202,6 +218,10 @@ activate_panel (CcWindow *self,
sidebar_widget = cc_panel_get_sidebar_widget (CC_PANEL (self->current_panel));
cc_panel_list_add_sidebar_widget (CC_PANEL_LIST (self->panel_list), sidebar_widget);
/* Ensure we show the panel when when the leaflet is folded and a sidebar
* widget's row is activated.
*/
g_signal_connect_object (self->current_panel, "sidebar-activated", G_CALLBACK (on_sidebar_activated_cb), self, 0);
/* Finish profiling */
g_timer_stop (timer);
......@@ -402,6 +422,7 @@ set_active_panel_from_id (CcShell *shell,
const gchar *start_id,
GVariant *parameters,
gboolean add_to_history,
gboolean force_moving_to_the_panel,
GError **error)
{
g_autoptr(GIcon) gicon = NULL;
......@@ -410,17 +431,22 @@ set_active_panel_from_id (CcShell *shell,
GtkTreeIter iter;
GtkWidget *old_panel;
CcWindow *self;
CcPanelListView view;
gboolean activated;
gboolean found;
CC_ENTRY;
self = CC_WINDOW (shell);
view = cc_panel_list_get_view (CC_PANEL_LIST (self->panel_list));
/* When loading the same panel again, just set its parameters */
if (g_strcmp0 (self->current_panel_id, start_id) == 0)
{
g_object_set (G_OBJECT (self->current_panel), "parameters", parameters, NULL);
if (force_moving_to_the_panel || self->previous_list_view == view)
hdy_leaflet_set_visible_child_name (HDY_LEAFLET (self->main_leaflet), "panel");
self->previous_list_view = view;
CC_RETURN (TRUE);
}
......@@ -454,6 +480,9 @@ set_active_panel_from_id (CcShell *shell,
if (add_to_history)
add_current_panel_to_history (shell, start_id);
if (force_moving_to_the_panel)
hdy_leaflet_set_visible_child_name (HDY_LEAFLET (self->main_leaflet), "panel");
g_free (self->current_panel_id);
self->current_panel_id = g_strdup (start_id);
......@@ -503,12 +532,39 @@ switch_to_previous_panel (CcWindow *self)
g_debug ("Going to previous panel (%s)", previous_panel_id);
set_active_panel_from_id (CC_SHELL (self), previous_panel_id, NULL, FALSE, NULL);
set_active_panel_from_id (CC_SHELL (self), previous_panel_id, NULL, FALSE, FALSE, NULL);
CC_EXIT;
}
/* Callbacks */
static void
update_fold_state (CcWindow *shell)
{
GtkWidget *header_child = hdy_leaflet_get_visible_child (HDY_LEAFLET (shell->header_box));
HdyFold fold = hdy_leaflet_get_fold (HDY_LEAFLET (shell->header_box));
hdy_header_group_set_focus (shell->header_group, fold == HDY_FOLD_FOLDED ? GTK_HEADER_BAR (header_child) : NULL);
gtk_revealer_set_reveal_child (GTK_REVEALER (shell->back_revealer), fold == HDY_FOLD_FOLDED);
}
static void
notify_header_visible_child_cb (HdyLeaflet *leaflet,
GParamSpec *pspec,
CcWindow *shell)
{
update_fold_state (shell);
}
static void
notify_fold_cb (HdyLeaflet *leaflet,
GParamSpec *pspec,
CcWindow *shell)
{
update_fold_state (shell);
}
static void
show_panel_cb (CcPanelList *panel_list,
const gchar *panel_id,
......@@ -517,7 +573,7 @@ show_panel_cb (CcPanelList *panel_list,
if (!panel_id)
return;
set_active_panel_from_id (CC_SHELL (self), panel_id, NULL, TRUE, NULL);
set_active_panel_from_id (CC_SHELL (self), panel_id, NULL, TRUE, FALSE, NULL);
}
static void
......@@ -531,6 +587,13 @@ search_entry_activate_cb (GtkEntry *entry,
gtk_search_bar_set_search_mode (GTK_SEARCH_BAR (self->search_bar), !changed);
}
static void
back_button_clicked_cb (GtkButton *button,
CcWindow *shell)
{
hdy_leaflet_set_visible_child_name (HDY_LEAFLET (shell->main_leaflet), "sidebar");
}
static void
previous_button_clicked_cb (GtkButton *button,
CcWindow *shell)
......@@ -647,30 +710,6 @@ window_key_press_event_cb (GtkWidget *win,
return retval;
}
static void
split_decorations_cb (GtkSettings *settings,
GParamSpec *pspec,
CcWindow *self)
{
g_autofree gchar *layout = NULL;
g_autofree gchar *layout_start = NULL;
g_autofree gchar *layout_end = NULL;
g_auto(GStrv) buttons = NULL;
g_object_get (settings, "gtk-decoration-layout", &layout, NULL);
buttons = g_strsplit (layout, ":", -1);
layout_start = g_strconcat ("", buttons[0], ":", NULL);
if (g_strv_length (buttons) > 1)
layout_end = g_strconcat (":", buttons[1], NULL);
else
layout_end = g_strdup ("");
gtk_header_bar_set_decoration_layout (GTK_HEADER_BAR (self->header), layout_start);
gtk_header_bar_set_decoration_layout (GTK_HEADER_BAR (self->panel_headerbar), layout_end);
}
static void
on_development_warning_dialog_responded_cb (GtkWidget *dialog,
gint response,
......@@ -689,7 +728,7 @@ cc_window_set_active_panel_from_id (CcShell *shell,
GVariant *parameters,
GError **error)
{
return set_active_panel_from_id (shell, start_id, parameters, TRUE, error);
return set_active_panel_from_id (shell, start_id, parameters, TRUE, TRUE, error);
}
static void
......@@ -788,20 +827,10 @@ static void
cc_window_constructed (GObject *object)
{
g_autofree char *id = NULL;
GtkSettings *settings;
CcWindow *self;
self = CC_WINDOW (object);
/* Handle decorations for the split headers. */
settings = gtk_settings_get_default ();
g_signal_connect (settings,
"notify::gtk-decoration-layout",
G_CALLBACK (split_decorations_cb),
self);
split_decorations_cb (settings, NULL, self);
/* Add the panels */
setup_model (self);
......@@ -873,11 +902,14 @@ cc_window_class_init (CcWindowClass *klass)
gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/ControlCenter/gtk/cc-window.ui");
gtk_widget_class_bind_template_child (widget_class, CcWindow, back_revealer);
gtk_widget_class_bind_template_child (widget_class, CcWindow, development_warning_dialog);
gtk_widget_class_bind_template_child (widget_class, CcWindow, header);
gtk_widget_class_bind_template_child (widget_class, CcWindow, header_box);
gtk_widget_class_bind_template_child (widget_class, CcWindow, header_group);
gtk_widget_class_bind_template_child (widget_class, CcWindow, header_sizegroup);
gtk_widget_class_bind_template_child (widget_class, CcWindow, list_scrolled);
gtk_widget_class_bind_template_child (widget_class, CcWindow, main_leaflet);
gtk_widget_class_bind_template_child (widget_class, CcWindow, panel_headerbar);
gtk_widget_class_bind_template_child (widget_class, CcWindow, panel_list);
gtk_widget_class_bind_template_child (widget_class, CcWindow, previous_button);
......@@ -887,7 +919,10 @@ cc_window_class_init (CcWindowClass *klass)
gtk_widget_class_bind_template_child (widget_class, CcWindow, stack);
gtk_widget_class_bind_template_child (widget_class, CcWindow, top_right_box);
gtk_widget_class_bind_template_callback (widget_class, back_button_clicked_cb);
gtk_widget_class_bind_template_callback (widget_class, gdk_window_set_cb);
gtk_widget_class_bind_template_callback (widget_class, notify_header_visible_child_cb);
gtk_widget_class_bind_template_callback (widget_class, notify_fold_cb);
gtk_widget_class_bind_template_callback (widget_class, on_development_warning_dialog_responded_cb);
gtk_widget_class_bind_template_callback (widget_class, previous_button_clicked_cb);
gtk_widget_class_bind_template_callback (widget_class, search_entry_activate_cb);
......@@ -909,10 +944,13 @@ cc_window_init (CcWindow *self)
self->settings = g_settings_new ("org.gnome.ControlCenter");
self->custom_widgets = g_ptr_array_new_with_free_func ((GDestroyNotify) g_object_unref);
self->previous_panels = g_queue_new ();
self->previous_list_view = cc_panel_list_get_view (CC_PANEL_LIST (self->panel_list));
/* Add a custom CSS class on development builds */
if (in_flatpak_sandbox ())
add_development_build_css (self);
update_fold_state (self);
}
CcWindow *
......
......@@ -10,9 +10,11 @@
<signal name="map-event" handler="window_map_event_cb" object="CcWindow" swapped="no" />
<signal name="key-press-event" handler="window_key_press_event_cb" object="CcWindow" swapped="no" after="yes" />
<child>
<object class="GtkBox" id="main_hbox">
<object class="HdyLeaflet" id="main_leaflet">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="mode-transition-type">slide</property>
<property name="child-transition-type">slide</property>
<child>
<object class="GtkBox" id="sidebar_box">
<property name="visible">True</property>
......@@ -74,22 +76,18 @@
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
<property name="name">sidebar</property>
</packing>
</child>
<child>
<object class="GtkSeparator">
<object class="GtkSeparator" id="panel_separator">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<style>
<class name="sidebar"/>
</style>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkStack" id="stack">
......@@ -98,23 +96,33 @@
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="transition_type">crossfade</property>
<property name="width_request">300</property>
<style>
<class name="background"/>
</style>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">2</property>
<property name="name">panel</property>
</packing>
</child>
</object>
</child>
<child type="titlebar">
<object class="GtkBox" id="header_box">
<object class="HdyTitleBar">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<object class="HdyLeaflet" id="header_box">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">horizontal</property>
<property name="mode-transition-type" bind-source="main_leaflet" bind-property="mode-transition-type" bind-flags="bidirectional|sync-create"/>
<property name="mode-transition-duration" bind-source="main_leaflet" bind-property="mode-transition-duration" bind-flags="bidirectional|sync-create"/>
<property name="child-transition-type" bind-source="main_leaflet" bind-property="child-transition-type" bind-flags="bidirectional|sync-create"/>
<property name="child-transition-duration" bind-source="main_leaflet" bind-property="child-transition-duration" bind-flags="bidirectional|sync-create"/>
<property name="visible-child-name" bind-source="main_leaflet" bind-property="visible-child-name" bind-flags="bidirectional|sync-create"/>
<signal name="notify::visible-child" handler="notify_header_visible_child_cb" swapped="no"/>
<signal name="notify::fold" handler="notify_fold_cb" object="CcWindow" after="yes" swapped="no"/>
<child>
<object class="GtkHeaderBar" id="header">
<property name="visible">True</property>
......@@ -192,12 +200,18 @@
</packing>
</child>
</object>
<packing>
<property name="name">sidebar</property>
</packing>
</child>
<child>
<object class="GtkSeparator">
<object class="GtkSeparator" id="header_separator">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<style>
<class name="sidebar"/>
</style>
</object>
</child>
<child>
......@@ -206,6 +220,40 @@
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="show_close_button">True</property>
<child>
<object class="GtkRevealer" id="back_revealer">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="transition-type">crossfade</property>
<property name="transition-duration" bind-source="main_leaflet" bind-property="mode-transition-duration" bind-flags="bidirectional|sync-create"/>
<child>
<object class="GtkButton" id="back">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="receives_default">False</property>
<property name="valign">center</property>
<property name="use-underline">True</property>
<signal name="clicked" handler="back_button_clicked_cb" object="CcWindow" swapped="no" />
<style>
<class name="image-button"/>
</style>
<child internal-child="accessible">
<object class="AtkObject" id="a11y-back">
<property name="accessible-name" translatable="yes">Back</property>
</object>
</child>
<child>
<object class="GtkImage" id="back_image">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="icon_name">go-previous-symbolic</property>
<property name="icon_size">1</property>
</object>
</child>
</object>
</child>
</object>
</child>
<child>
<object class="GtkBox" id="top_right_box">
<property name="visible">True</property>
......@@ -216,10 +264,23 @@
</packing>
</child>
</object>
<packing>
<property name="name">panel</property>
</packing>
</child>
</object>
</child>
</object>
</child>
</template>
<object class="HdyHeaderGroup" id="header_group">
<headerbars>
<headerbar name="header"/>
<headerbar name="panel_headerbar"/>
</headerbars>
</object>
<object class="GtkSizeGroup" id="header_sizegroup">
<property name="mode">vertical</property>
<widgets>
......@@ -237,6 +298,24 @@
</widgets>
</object>
<!-- Synchronize separators -->
<object class="GtkSizeGroup">
<property name="mode">horizontal</property>
<widgets>
<widget name="header_separator"/>
<widget name="panel_separator"/>
</widgets>
</object>
<!-- Synchronize right header and panel -->
<object class="GtkSizeGroup">
<property name="mode">horizontal</property>
<widgets>
<widget name="panel_headerbar"/>
<widget name="stack"/>
</widgets>
</object>
<!-- Warning dialog for development builds -->
<object class="GtkMessageDialog" id="development_warning_dialog">
<property name="message-type">warning</property>
......