diff options
| -rw-r--r-- | ucb/source/ucp/cmis/auth_provider.cxx | 6 | ||||
| -rw-r--r-- | uui/uiconfig/ui/authfallback.ui | 122 |
2 files changed, 76 insertions, 52 deletions
diff --git a/ucb/source/ucp/cmis/auth_provider.cxx b/ucb/source/ucp/cmis/auth_provider.cxx index 63e742f84282..97414f19e864 100644 --- a/ucb/source/ucp/cmis/auth_provider.cxx +++ b/ucb/source/ucp/cmis/auth_provider.cxx @@ -70,9 +70,9 @@ namespace cmis const char* /*username*/, const char* /*password*/ ) { - OUString instructions = "Please open the following link in your browser and\n" - "paste the code from the URL you have been redirected to\n" - "in the box bellow. For example:\n" + OUString instructions = "Open the following link in your browser and " + "paste the code from the URL you have been redirected to in the " + "box below. For example:\n" "https://login.live.com/oauth20_desktop.srf?code=YOUR_CODE&lc=1033"; OUString url_oustr( url, strlen( url ), RTL_TEXTENCODING_UTF8 ); const com::sun::star::uno::Reference< diff --git a/uui/uiconfig/ui/authfallback.ui b/uui/uiconfig/ui/authfallback.ui index 6e79a4c25f6d..a947ad4e24f2 100644 --- a/uui/uiconfig/ui/authfallback.ui +++ b/uui/uiconfig/ui/authfallback.ui @@ -1,80 +1,89 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- Generated with glade 3.18.3 --> <interface> - <!-- interface-requires gtk+ 3.0 --> + <requires lib="gtk+" version="3.0"/> <object class="GtkDialog" id="AuthFallbackDlg"> <property name="can_focus">False</property> - <property name="title" translatable="yes">OneDrive authentication code</property> + <property name="border_width">6</property> + <property name="title" translatable="yes">OneDrive Authentication Code</property> <property name="default_width">400</property> <property name="default_height">270</property> - <child> - <object class="GtkBox" id="box"> - <property name="visible">True</property> + <property name="type_hint">dialog</property> + <property name="skip_taskbar_hint">True</property> + <child internal-child="vbox"> + <object class="GtkBox" id="messagedialog-vbox"> <property name="can_focus">False</property> <property name="orientation">vertical</property> - <child> - <object class="GtkTextView" id="instructions"> - <property name="visible">True</property> + <property name="spacing">12</property> + <child internal-child="action_area"> + <object class="GtkButtonBox" id="messagedialog-action_area"> <property name="can_focus">False</property> - <property name="pixels_below_lines">4</property> - <property name="editable">False</property> - <property name="cursor_visible">False</property> + <property name="layout_style">end</property> + <child> + <object class="GtkButton" id="ok"> + <property name="label">gtk-ok</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="can_default">True</property> + <property name="has_default">True</property> + <property name="receives_default">True</property> + <property name="use_stock">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkButton" id="cancel"> + <property name="label">gtk-cancel</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="use_stock">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> + <property name="pack_type">end</property> <property name="position">0</property> </packing> </child> <child> - <object class="GtkEntry" id="url"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="invisible_char">●</property> - <property name="editable">False</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="code"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="invisible_char">●</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">2</property> - </packing> - </child> - <child> - <object class="GtkButtonBox" id="buttonbox"> + <object class="GtkBox" id="box"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="spacing">46</property> - <property name="layout_style">start</property> + <property name="orientation">vertical</property> + <property name="spacing">6</property> <child> - <object class="GtkButton" id="ok"> - <property name="label" translatable="yes">Ok</property> + <object class="GtkTextView" id="instructions"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="receives_default">True</property> + <property name="pixels_below_lines">4</property> + <property name="editable">False</property> + <property name="wrap_mode">word</property> + <property name="cursor_visible">False</property> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">0</property> </packing> </child> <child> - <object class="GtkButton" id="cancel"> - <property name="label" translatable="yes">Cancel</property> + <object class="GtkEntry" id="url"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="receives_default">True</property> + <property name="editable">False</property> + <property name="invisible_char">●</property> </object> <packing> <property name="expand">False</property> @@ -82,15 +91,30 @@ <property name="position">1</property> </packing> </child> + <child> + <object class="GtkEntry" id="code"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="invisible_char">●</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> </object> <packing> - <property name="expand">True</property> + <property name="expand">False</property> <property name="fill">True</property> - <property name="padding">6</property> - <property name="position">3</property> + <property name="position">4</property> </packing> </child> </object> </child> + <action-widgets> + <action-widget response="0">ok</action-widget> + <action-widget response="0">cancel</action-widget> + </action-widgets> </object> </interface> |