diff options
| author | Muhammet Kara <muhammet.kara@pardus.org.tr> | 2016-04-10 22:25:14 +0300 |
|---|---|---|
| committer | Lionel Elie Mamane <lionel@mamane.lu> | 2016-04-11 11:57:59 +0000 |
| commit | 87e949b68e9931ed5f19ab6ceb8a709ec2d3d6cf (patch) | |
| tree | f7517aa46d90958c1634913dc67e71c2cc578d02 | |
| parent | 654fa8aaed2f959103e3402e2036e9b1e0d734fc (diff) | |
tdf#49554 Fix misleading error message
Fix misleading error message about primary key
on first page of table import wizard, and give
additional info about the process by adding
an info label.
Change-Id: I7c511abc512b7ab87321c055057bae4f42e29af1
Reviewed-on: https://gerrit.libreoffice.org/23969
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Lionel Elie Mamane <lionel@mamane.lu>
| -rw-r--r-- | dbaccess/source/ui/inc/dbu_misc.hrc | 2 | ||||
| -rw-r--r-- | dbaccess/source/ui/misc/WCPage.cxx | 2 | ||||
| -rw-r--r-- | dbaccess/source/ui/misc/WizardPages.src | 4 | ||||
| -rw-r--r-- | dbaccess/uiconfig/ui/copytablepage.ui | 16 |
4 files changed, 19 insertions, 5 deletions
diff --git a/dbaccess/source/ui/inc/dbu_misc.hrc b/dbaccess/source/ui/inc/dbu_misc.hrc index 61b5d6728ce9..48b1ee54b441 100644 --- a/dbaccess/source/ui/inc/dbu_misc.hrc +++ b/dbaccess/source/ui/inc/dbu_misc.hrc @@ -25,7 +25,7 @@ #define IMG_DOWN RID_STR_MISC_START + 1 #define STR_WIZ_COLUMN_SELECT_TITEL RID_STR_MISC_START + 2 #define STR_WIZ_TYPE_SELECT_TITEL RID_STR_MISC_START + 3 -#define STR_WIZ_PKEY_ALREADY_DEFINED RID_STR_MISC_START + 4 +#define STR_WIZ_NAME_ALREADY_DEFINED RID_STR_MISC_START + 4 #define STR_WIZ_NAME_MATCHING_TITEL RID_STR_MISC_START + 5 #define STR_WIZ_TABLE_COPY RID_STR_MISC_START + 6 #define STR_COPYTABLE_TITLE_COPY RID_STR_MISC_START + 7 diff --git a/dbaccess/source/ui/misc/WCPage.cxx b/dbaccess/source/ui/misc/WCPage.cxx index c866e3ec51db..1613036643aa 100644 --- a/dbaccess/source/ui/misc/WCPage.cxx +++ b/dbaccess/source/ui/misc/WCPage.cxx @@ -205,7 +205,7 @@ bool OCopyTable::LeavePage() if ( m_pParent->m_bCreatePrimaryKeyColumn && m_pParent->m_aKeyName != m_pParent->createUniqueName(m_pParent->m_aKeyName) ) { - OUString aInfoString( ModuleRes(STR_WIZ_PKEY_ALREADY_DEFINED) ); + OUString aInfoString( ModuleRes(STR_WIZ_NAME_ALREADY_DEFINED) ); aInfoString += " "; aInfoString += m_pParent->m_aKeyName; m_pParent->showError(aInfoString); diff --git a/dbaccess/source/ui/misc/WizardPages.src b/dbaccess/source/ui/misc/WizardPages.src index ed04106ea192..4f2d1e84ded7 100644 --- a/dbaccess/source/ui/misc/WizardPages.src +++ b/dbaccess/source/ui/misc/WizardPages.src @@ -31,9 +31,9 @@ String STR_WIZ_TYPE_SELECT_TITEL Text [ en-US ] = "Type formatting"; }; -String STR_WIZ_PKEY_ALREADY_DEFINED +String STR_WIZ_NAME_ALREADY_DEFINED { - Text [ en-US ] = "The following fields have already been set as primary keys:\n"; + Text [ en-US ] = "Enter a unique name for the new primary key data field.\nThe following name is already in use:"; }; String STR_WIZ_NAME_MATCHING_TITEL diff --git a/dbaccess/uiconfig/ui/copytablepage.ui b/dbaccess/uiconfig/ui/copytablepage.ui index ca94cde15e00..dd082b499998 100644 --- a/dbaccess/uiconfig/ui/copytablepage.ui +++ b/dbaccess/uiconfig/ui/copytablepage.ui @@ -112,7 +112,7 @@ </child> <child> <object class="GtkCheckButton" id="primarykey"> - <property name="label" translatable="yes">Crea_te primary key</property> + <property name="label" translatable="yes">Crea_te new field as primary key</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -167,6 +167,20 @@ <property name="top_attach">6</property> </packing> </child> + <child> + <object class="GtkLabel" id="infoLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Existing data fields can be set as primary key on the type formatting step (third page) of the wizard.</property> + <property name="wrap">True</property> + <property name="max_width_chars">72</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">7</property> + </packing> + </child> </object> </child> </object> |