[Libreoffice-commits] core.git: sw/source sw/uiconfig
sw/source/ui/fldui/fldref.cxx| 129 +++
sw/source/ui/fldui/fldref.hxx|8 +
sw/uiconfig/swriter/ui/fldrefpage.ui | 167 ++-
3 files changed, 207 insertions(+), 97 deletions(-)
New commits:
commit bebd483511a0a83532dc37e76e8ba76a67dd921f
Author: akki95
Date: Mon Feb 8 09:11:06 2016 +0530
tdf#32364 - Add a "filter" to Insert > Field > Other > Cross reference tab
-> Modified fldrefpage.ui using Glade to include filter GTK textbox.
-> Added related code in fldref.cxx and fldref.hxx
-> Modified UpdateSubType() code: Added a parameter and code to get the
desired result.
Change-Id: I3044c9d38b5f0a984ddcd0f27d075a86abaae7fe
Reviewed-on: https://gerrit.libreoffice.org/22197
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt
Tested-by: Samuel Mehrbrodt
diff --git a/sw/source/ui/fldui/fldref.cxx b/sw/source/ui/fldui/fldref.cxx
index 3110167..216f4d7 100644
--- a/sw/source/ui/fldui/fldref.cxx
+++ b/sw/source/ui/fldui/fldref.cxx
@@ -32,6 +32,8 @@
#include
#include
+#include
+
#include
#define REFFLDFLAG 0x4000
@@ -66,6 +68,7 @@ SwFieldRefPage::SwFieldRefPage(vcl::Window* pParent, const
SfxItemSet& rCoreSet
get(m_pNameFT, "nameft");
get(m_pNameED, "name");
get(m_pValueED, "value");
+get(m_pFilterED, "filter");
sBookmarkText = m_pTypeLB->GetEntry(0);
sFootnoteText = m_pTypeLB->GetEntry(1);
@@ -90,6 +93,7 @@ SwFieldRefPage::SwFieldRefPage(vcl::Window* pParent, const
SfxItemSet& rCoreSet
m_pSelectionToolTipLB->set_width_request(nWidth*2);
m_pNameED->SetModifyHdl(LINK(this, SwFieldRefPage, ModifyHdl));
+m_pFilterED->SetModifyHdl( LINK( this, SwFieldRefPage, ModifyHdl_Impl ) );
m_pTypeLB->SetDoubleClickHdl (LINK(this, SwFieldRefPage,
ListBoxInsertHdl));
m_pTypeLB->SetSelectHdl(LINK(this, SwFieldRefPage, TypeHdl));
@@ -120,10 +124,17 @@ void SwFieldRefPage::dispose()
m_pFormatLB.clear();
m_pNameFT.clear();
m_pNameED.clear();
+m_pFilterED.clear();
m_pValueED.clear();
SwFieldPage::dispose();
}
+IMPL_LINK_NOARG_TYPED(SwFieldRefPage, ModifyHdl_Impl, Edit&, void)
+{
+OUString sFilter = comphelper::string::strip(m_pFilterED->GetText(), ' ');
+UpdateSubType(sFilter);
+}
+
// #i83479#
void SwFieldRefPage::SaveSelectedTextNode()
{
@@ -284,6 +295,7 @@ void SwFieldRefPage::Reset(const SfxItemSet* )
m_pFormatLB->SaveValue();
m_pNameED->SaveValue();
m_pValueED->SaveValue();
+m_pFilterED->SetText(OUString());
}
}
@@ -381,6 +393,7 @@ IMPL_LINK_NOARG_TYPED(SwFieldRefPage, TypeHdl, ListBox&,
void)
{
m_pNameED->SetText(aEmptyOUStr);
m_pValueED->SetText(aEmptyOUStr);
+m_pFilterED->SetText(aEmptyOUStr);
}
switch (nTypeId)
@@ -420,6 +433,7 @@ IMPL_LINK_NOARG_TYPED(SwFieldRefPage, TypeHdl, ListBox&,
void)
SubTypeHdl();
ModifyHdl(*m_pNameED);
+ModifyHdl(*m_pFilterED);
}
}
@@ -476,8 +490,8 @@ void SwFieldRefPage::SubTypeHdl()
}
}
-// renew types in SelectionLB
-void SwFieldRefPage::UpdateSubType()
+// renew types in SelectionLB after filtering
+void SwFieldRefPage::UpdateSubType(OUString filterString)
{
SwWrtShell *pSh = GetWrtShell();
if(!pSh)
@@ -518,7 +532,13 @@ void SwFieldRefPage::UpdateSubType()
{
const ::sw::mark::IMark* pBkmk = ppMark->get();
if(IDocumentMarkAccess::MarkType::BOOKMARK ==
IDocumentMarkAccess::GetType(*pBkmk))
-m_pSelectionLB->InsertEntry( pBkmk->GetName() );
+{
+bool isSubstring = MatchSubstring(pBkmk->GetName(),
filterString);
+if(isSubstring)
+{
+m_pSelectionLB->InsertEntry( pBkmk->GetName() );
+}
+}
}
if (IsFieldEdit())
sOldSel = pRefField->GetSetRefName();
@@ -531,7 +551,11 @@ void SwFieldRefPage::UpdateSubType()
for( size_t n = 0; n < nCnt; ++n )
{
-m_pSelectionLB->InsertEntry( aArr[ n ]->sDlgEntry );
+bool isSubstring = MatchSubstring(aArr[ n ]->sDlgEntry,
filterString);
+if(isSubstring)
+{
+m_pSelectionLB->InsertEntry( aArr[ n ]->sDlgEntry );
+}
if (IsFieldEdit() && pRefField->GetSeqNo() == aArr[ n
]->nSeqNo)
sOldSel = aArr[n]->sDlgEntry;
}
@@ -544,7 +568,11 @@ void SwFieldRefPage::UpdateSubType()
for( size_t n = 0; n < nCnt; ++n )
[Libreoffice-commits] core.git: cui/source cui/uiconfig cui/UIConfig_cui.mk include/vcl vcl/source
cui/UIConfig_cui.mk |1
cui/source/options/optjava.cxx | 119 ---
cui/source/options/optjava.hxx | 26 +
cui/uiconfig/ui/javastartparametersdialog.ui | 57 ++-
cui/uiconfig/ui/javastartparameterseditdialog.ui | 107
include/vcl/edit.hxx |2
vcl/source/control/edit.cxx |6 +
7 files changed, 282 insertions(+), 36 deletions(-)
New commits:
commit 3ae9eaa79353bc43d0a1dd32cbdb09236256a22b
Author: akki95
Date: Tue Feb 9 03:37:37 2016 +0530
tdf#97425 - JVM start parameters should be editable.
Added new dialog to edit Java start Parameter.
Modified UI of JavaStartParameterDialog using Glade.
Renamed Assign Button to Add.
Added a function to edit.cxx vcl file to move cursor to last letter of
GTKEntry.
Change-Id: Ia43e2c0fbced5674a84187de02a9bc9460141f2d
Reviewed-on: https://gerrit.libreoffice.org/0
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt
diff --git a/cui/UIConfig_cui.mk b/cui/UIConfig_cui.mk
index b0f72cb..697c701 100644
--- a/cui/UIConfig_cui.mk
+++ b/cui/UIConfig_cui.mk
@@ -90,6 +90,7 @@ $(eval $(call gb_UIConfig_add_uifiles,cui,\
cui/uiconfig/ui/insertrowcolumn \
cui/uiconfig/ui/javaclasspathdialog \
cui/uiconfig/ui/javastartparametersdialog \
+ cui/uiconfig/ui/javastartparameterseditdialog \
cui/uiconfig/ui/linedialog \
cui/uiconfig/ui/linetabpage \
cui/uiconfig/ui/lineendstabpage \
diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx
index 5568cdc..29a2c5f 100644
--- a/cui/source/options/optjava.cxx
+++ b/cui/source/options/optjava.cxx
@@ -311,7 +311,10 @@ IMPL_LINK_NOARG_TYPED(SvxJavaOptionsPage,
ParameterHdl_Impl, Button*, void)
}
}
else
+{
aParameterList = m_pParamDlg->GetParameters();
+m_pParamDlg->DisableButtons(); //disable add, edit and remove button
when dialog is reopened
+}
if ( m_pParamDlg->Execute() == RET_OK )
{
@@ -844,17 +847,7 @@ IMPL_LINK_NOARG_TYPED(SvxJavaParameterDlg, AssignHdl_Impl,
Button*, void)
IMPL_LINK_NOARG_TYPED(SvxJavaParameterDlg, EditHdl_Impl, Button*, void)
{
-sal_Int32 nPos = m_pAssignedList->GetSelectEntryPos();
-
-if ( nPos != LISTBOX_ENTRY_NOTFOUND )
-{
-OUString eVal = m_pAssignedList->GetSelectEntry();
-m_pAssignedList->RemoveEntry( nPos );
-m_pParameterEdit->SetText( eVal );
-}
-DisableRemoveButton();
-DisableEditButton();
-EnableAssignButton();
+EditParameter();
}
@@ -867,9 +860,7 @@ IMPL_LINK_NOARG_TYPED(SvxJavaParameterDlg, SelectHdl_Impl,
ListBox&, void)
IMPL_LINK_NOARG_TYPED(SvxJavaParameterDlg, DblClickHdl_Impl, ListBox&, void)
{
-sal_Int32 nPos = m_pAssignedList->GetSelectEntryPos();
-if ( nPos != LISTBOX_ENTRY_NOTFOUND )
-m_pParameterEdit->SetText( m_pAssignedList->GetEntry( nPos ) );
+EditParameter();
}
@@ -886,10 +877,58 @@ IMPL_LINK_NOARG_TYPED(SvxJavaParameterDlg,
RemoveHdl_Impl, Button*, void)
nPos = ( nCount - 1 );
m_pAssignedList->SelectEntryPos( nPos );
}
+else
+{
+DisableEditButton();
+}
}
EnableRemoveButton();
}
+void SvxJavaParameterDlg::EditParameter()
+{
+sal_Int32 nPos = m_pAssignedList->GetSelectEntryPos();
+m_pParameterEdit->SetText( OUString() );
+OUString editedClassPath;
+
+if ( nPos != LISTBOX_ENTRY_NOTFOUND )
+{
+if ( !m_pParamEditDlg )
+{
+m_pParamEditDlg = VclPtr::Create( this );
+editedClassPath = m_pAssignedList->GetSelectEntry();
+m_pParamEditDlg->SetParameter( editedClassPath );
+}
+else{
+editedClassPath = m_pAssignedList->GetSelectEntry();
+m_pParamEditDlg->SetParameter( editedClassPath );
+}
+}
+else
+{
+if(m_pParamEditDlg)
+{
+editedClassPath = m_pParamEditDlg->GetParameter();
+}
+}
+
+if ( m_pParamEditDlg->Execute() == RET_OK )
+{
+if (!( editedClassPath == m_pParamEditDlg->GetParameter() ) )
+{
+editedClassPath = m_pParamEditDlg->GetParameter();
+if( !editedClassPath.isEmpty() ){
+m_pAssignedList->RemoveEntry( nPos );
+m_pAssignedList->InsertEntry( editedClassPath, nPos );
+m_pAssignedList->SelectEntryPos( nPos );
+}
+}
+}
+else
+{
+m_pParamEditDlg->SetParameter( editedClassPath );
+}
+}
short SvxJavaParameterDlg::Execute()
{
@@ -905,11 +944,18 @@ Sequence< OUString > SvxJavaParameterDlg::GetParameters()
const
Sequence< OUString > aParamList( nCount
[Libreoffice-commits] core.git: officecfg/registry
officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu| 2 - officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu | 2 - officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu | 14 +- officecfg/registry/data/org/openoffice/Office/UI/StartModuleCommands.xcu | 2 - officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu | 6 ++-- 5 files changed, 13 insertions(+), 13 deletions(-) New commits: commit 775a51cec9c439cca83d0c9bac7bb7a9c66ec5c6 Author: akki95 Date: Tue Jan 26 21:56:18 2016 +0530 tdf#94865: MENU: Duplicate accelerators in en_US version Modified Accelerator Keys. Removed the accessibility issues from the Edit menu items. Verified by AcceleratorKeyChecker.odt In some cases, duplicates with no submenu exists. Change-Id: Ia4f8d8d66ce4993d39da0b500640af5a88a5cd1d Reviewed-on: https://gerrit.libreoffice.org/21815 Reviewed-by: Samuel Mehrbrodt Tested-by: Samuel Mehrbrodt diff --git a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu index c2bbc34..8f4d911 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu @@ -284,7 +284,7 @@ - Selection Mode + Se~lection Mode diff --git a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu index b497591..d75f825 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu @@ -588,7 +588,7 @@ - H~yperlink... + ~Hyperlink... diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu index 89220a4..61445ba 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu @@ -3666,7 +3666,7 @@ - Redo + ~Redo 1 @@ -3674,7 +3674,7 @@ - Undo + ~Undo 1 @@ -3693,7 +3693,7 @@ - ~Repeat + Repea~t 1 @@ -3706,7 +3706,7 @@ - Cu~t + ~Cut 1 @@ -3714,7 +3714,7 @@ - ~Copy + Cop~y 1 @@ -3883,7 +3883,7 @@ - ImageMap + Image~Map 9 @@ -5775,7 +5775,7 @@ - C~omment + Comme~nt diff --git a/officecfg/registry/data/org/openoffice/Office/UI/StartModuleCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/StartModuleCommands.xcu index 1455627..b1d34120 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/StartModuleCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/StartModuleCommands.xcu @@ -54,7 +54,7 @@ - Cu~t + ~Cut 1 diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu index 7903030..885ae88 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu @@ -312,7 +312,7 @@ - H~yperlink + ~Hyperlink Edit Hyperlink... @@ -361,7 +361,7 @@ - Exc~hange Database... + Exchange Data~base... 1 @@ -684,7 +684,7 @@ - Selection Mode + Se~lection Mode ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/source
cui/source/options/optjava.cxx |2 ++ 1 file changed, 2 insertions(+) New commits: commit 5008b9a692296ab72e08d397a49d11d0f83c Author: akki95 Date: Wed Feb 3 04:54:01 2016 +0530 tdf#96132 Enabling Experimental Features in UI doesn't warn about restart Change-Id: I2efafee4f8ebd4cd7ba2b7a23f68ca08022eb659 Reviewed-on: https://gerrit.libreoffice.org/22064 Reviewed-by: Samuel Mehrbrodt Tested-by: Samuel Mehrbrodt diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx index ed32628..6c8e805 100644 --- a/cui/source/options/optjava.cxx +++ b/cui/source/options/optjava.cxx @@ -665,6 +665,8 @@ bool SvxJavaOptionsPage::FillItemSet( SfxItemSet* /*rCoreSet*/ ) SvtMiscOptions aMiscOpt; aMiscOpt.SetExperimentalMode( m_pExperimentalCB->IsChecked() ); bModified = true; +ScopedVclPtrInstance< MessageDialog > aWarnBox( this, CUI_RES( RID_SVXSTR_OPTIONS_RESTART ), VCL_MESSAGE_INFO ); +aWarnBox->Execute(); } if ( m_pMacroCB->IsValueChangedFromSaved() ) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/uibase/utlui/navipi.cxx |3 +++
sw/source/uibase/utlui/navipi.src |4 ++--
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 20e2d7e7d1c518fe514e8252836c1c728fe3fc27
Author: akki95
Date: Sat Jan 30 09:55:41 2016 +0530
tdf#95408 -"Toggle" in Writer Navigator to be more explicit in what it
toggles
Bug resolved. Removed toggle button from non-master documents.
Toggle button working for master documents only.
Changed toggle button tooltip to "Toggle Master View"
Change-Id: I7b77bae812ac208b0b93fff9e114b063d2ae2520
Reviewed-on: https://gerrit.libreoffice.org/21913
Reviewed-by: Samuel Mehrbrodt
Tested-by: Samuel Mehrbrodt
diff --git a/sw/source/uibase/utlui/navipi.cxx
b/sw/source/uibase/utlui/navipi.cxx
index de53270..b87f144 100644
--- a/sw/source/uibase/utlui/navipi.cxx
+++ b/sw/source/uibase/utlui/navipi.cxx
@@ -705,6 +705,9 @@ SwNavigationPI::SwNavigationPI( SfxBindings* _pBindings,
m_aContentToolBox->InsertSeparator(4);
m_aContentToolBox->SetHelpId(FN_PAGENUMBER, HID_NAVI_TBX16);
m_aContentToolBox->ShowItem( FN_PAGENUMBER );
+if(!IsGlobalDoc()){
+m_aContentToolBox->HideItem( FN_GLOBAL_SWITCH );
+}
for( sal_uInt16 i = 0; i <= static_cast(RegionMode::EMBEDDED);
i++ )
{
diff --git a/sw/source/uibase/utlui/navipi.src
b/sw/source/uibase/utlui/navipi.src
index aaa15cd..01cfa8b 100644
--- a/sw/source/uibase/utlui/navipi.src
+++ b/sw/source/uibase/utlui/navipi.src
@@ -82,7 +82,7 @@ Window DLG_NAVIGATION_PI
{
Identifier = FN_GLOBAL_SWITCH ;
HelpID = HID_NAVI_TBX17 ;
-Text [ en-US ] = "Toggle" ;
+Text [ en-US ] = "Toggle Master View" ;
};
ToolBoxItem
{
@@ -215,7 +215,7 @@ Window DLG_NAVIGATION_PI
{
Identifier = FN_GLOBAL_SWITCH ;
HelpID = HID_NAVI_TBX17 ;
-Text [ en-US ] = "Toggle" ;
+Text [ en-US ] = "Toggle Master View" ;
};
ToolBoxItem
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: configmgr/qa cui/uiconfig officecfg/registry sw/uiconfig
configmgr/qa/unit/data.xcd |4 ++-- cui/uiconfig/ui/optmemorypage.ui |2 +- officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu |2 +- officecfg/registry/data/org/openoffice/Office/UI/ReportCommands.xcu |2 +- sw/uiconfig/swriter/ui/printoptionspage.ui |2 +- sw/uiconfig/swriter/ui/viewoptionspage.ui|2 +- 6 files changed, 7 insertions(+), 7 deletions(-) New commits: commit a78f074a0b0be4577ffd9bbf4fe00cc7f06ee9bb Author: akki95 Date: Thu Jan 28 05:47:22 2016 +0530 tdf#70998 Termchange: Graphic/Picture->Image Changed visible terms as required. Change-Id: Id4335629977aa8512c753241d7c2203820716b73 Reviewed-on: https://gerrit.libreoffice.org/21857 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt diff --git a/configmgr/qa/unit/data.xcd b/configmgr/qa/unit/data.xcd index 8453c3b..4cc86ab 100644 --- a/configmgr/qa/unit/data.xcd +++ b/configmgr/qa/unit/data.xcd @@ -1834,7 +1834,7 @@ - Graphics mode + Image mode 1 @@ -3840,7 +3840,7 @@ - Presentation Graphic Options + Presentation Image Options diff --git a/cui/uiconfig/ui/optmemorypage.ui b/cui/uiconfig/ui/optmemorypage.ui index 691c8f2..072f9b5 100644 --- a/cui/uiconfig/ui/optmemorypage.ui +++ b/cui/uiconfig/ui/optmemorypage.ui @@ -185,7 +185,7 @@ True False -Graphics Cache +Image Cache diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu index 3c59b24..89220a4 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu @@ -1883,7 +1883,7 @@ - Graphics mode + Image mode 1 diff --git a/officecfg/registry/data/org/openoffice/Office/UI/ReportCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/ReportCommands.xcu index 1c49f22..3d70f1c 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/ReportCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/ReportCommands.xcu @@ -121,7 +121,7 @@ - Graphic... + Image.. diff --git a/sw/uiconfig/swriter/ui/printoptionspage.ui b/sw/uiconfig/swriter/ui/printoptionspage.ui index 95e5ae2..255cbea 100644 --- a/sw/uiconfig/swriter/ui/printoptionspage.ui +++ b/sw/uiconfig/swriter/ui/printoptionspage.ui @@ -34,7 +34,7 @@ 6 -_Pictures and objects +_Images and objects True True False diff --git a/sw/uiconfig/swriter/ui/viewoptionspage.ui b/sw/uiconfig/swriter/ui/viewoptionspage.ui index 834d15a..bf48688 100644 --- a/sw/uiconfig/swriter/ui/viewoptionspage.ui +++ b/sw/uiconfig/swriter/ui/viewoptionspage.ui @@ -94,7 +94,7 @@ 6 -_Graphics and objects +_Images and objects True True False ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sd/uiconfig
sd/uiconfig/simpress/ui/presentationdialog.ui | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) New commits: commit 3534e361405ed86ce3534b0a85234d6431a88aaa Author: akki95 Date: Sun Jan 31 01:04:14 2016 +0530 tdf#96252 - UI Confusing wording in Slideshow settings > Type of slideshow Change-Id: Iae8a1980bb5b42c14c280c4b6d860f70fb4639e8 Reviewed-on: https://gerrit.libreoffice.org/21946 Reviewed-by: Samuel Mehrbrodt Tested-by: Samuel Mehrbrodt diff --git a/sd/uiconfig/simpress/ui/presentationdialog.ui b/sd/uiconfig/simpress/ui/presentationdialog.ui index 10c0899..c044a5a 100644 --- a/sd/uiconfig/simpress/ui/presentationdialog.ui +++ b/sd/uiconfig/simpress/ui/presentationdialog.ui @@ -5,7 +5,7 @@ False 6 -Slide Show +Slide Show Settings dialog @@ -314,7 +314,7 @@ 6 -_Default +F_ull screen True True False @@ -331,7 +331,7 @@ -_Window +In a _window True True False @@ -347,7 +347,7 @@ -A_uto +_Loop and repeat after: True True False @@ -409,7 +409,7 @@ True False -Type +Presentation Mode ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/source cui/uiconfig
cui/source/options/optjava.cxx | 21 -
cui/source/options/optjava.hxx | 23 +++
cui/uiconfig/ui/javastartparametersdialog.ui | 14 ++
3 files changed, 57 insertions(+), 1 deletion(-)
New commits:
commit 7e51aeaa6797025ec8c1e7cea39a478edbca83d5
Author: akki95
Date: Sat Jan 30 06:39:52 2016 +0530
tdf#97425 - JVM start parameters should be editable.
Bug Resolved.
Change-Id: I8bd5ee684a03f8e24f0b74d63ea98923945b0870
Reviewed-on: https://gerrit.libreoffice.org/21912
Tested-by: Jenkins
Reviewed-by: jan iversen
diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx
index ee76523..3de28be 100644
--- a/cui/source/options/optjava.cxx
+++ b/cui/source/options/optjava.cxx
@@ -808,14 +808,17 @@ SvxJavaParameterDlg::SvxJavaParameterDlg( vcl::Window*
pParent ) :
m_pAssignedList->SetDropDownLineCount(6);
m_pAssignedList->set_width_request(m_pAssignedList->approximate_char_width() *
54);
get( m_pRemoveBtn, "removebtn");
+get( m_pEditBtn, "editbtn");
m_pParameterEdit->SetModifyHdl( LINK( this, SvxJavaParameterDlg,
ModifyHdl_Impl ) );
m_pAssignBtn->SetClickHdl( LINK( this, SvxJavaParameterDlg, AssignHdl_Impl
) );
m_pRemoveBtn->SetClickHdl( LINK( this, SvxJavaParameterDlg, RemoveHdl_Impl
) );
+m_pEditBtn->SetClickHdl( LINK( this, SvxJavaParameterDlg, EditHdl_Impl ) );
m_pAssignedList->SetSelectHdl( LINK( this, SvxJavaParameterDlg,
SelectHdl_Impl ) );
m_pAssignedList->SetDoubleClickHdl( LINK( this, SvxJavaParameterDlg,
DblClickHdl_Impl ) );
ModifyHdl_Impl( *m_pParameterEdit );
+EnableEditButton();
EnableRemoveButton();
}
@@ -830,6 +833,7 @@ void SvxJavaParameterDlg::dispose()
m_pAssignBtn.clear();
m_pAssignedList.clear();
m_pRemoveBtn.clear();
+m_pEditBtn.clear();
ModalDialog::dispose();
}
@@ -853,14 +857,30 @@ IMPL_LINK_NOARG_TYPED(SvxJavaParameterDlg,
AssignHdl_Impl, Button*, void)
m_pAssignedList->SelectEntryPos( nPos );
m_pParameterEdit->SetText( OUString() );
ModifyHdl_Impl( *m_pParameterEdit );
+EnableEditButton();
EnableRemoveButton();
}
}
+IMPL_LINK_NOARG_TYPED(SvxJavaParameterDlg, EditHdl_Impl, Button*, void)
+{
+sal_Int32 nPos = m_pAssignedList->GetSelectEntryPos();
+
+if ( nPos != LISTBOX_ENTRY_NOTFOUND )
+{
+OUString eVal = m_pAssignedList->GetSelectEntry();
+m_pAssignedList->RemoveEntry( nPos );
+m_pParameterEdit->SetText( eVal );
+}
+DisableRemoveButton();
+DisableEditButton();
+EnableAssignButton();
+}
IMPL_LINK_NOARG_TYPED(SvxJavaParameterDlg, SelectHdl_Impl, ListBox&, void)
{
+EnableEditButton();
EnableRemoveButton();
}
@@ -893,7 +913,6 @@ IMPL_LINK_NOARG_TYPED(SvxJavaParameterDlg, RemoveHdl_Impl,
Button*, void)
}
-
short SvxJavaParameterDlg::Execute()
{
m_pParameterEdit->GrabFocus();
diff --git a/cui/source/options/optjava.hxx b/cui/source/options/optjava.hxx
index 84fdfa4..0c8a416 100644
--- a/cui/source/options/optjava.hxx
+++ b/cui/source/options/optjava.hxx
@@ -127,18 +127,40 @@ private:
VclPtrm_pAssignedList;
VclPtr m_pRemoveBtn;
+VclPtr m_pEditBtn;
+
DECL_LINK_TYPED(ModifyHdl_Impl, Edit&, void);
DECL_LINK_TYPED(AssignHdl_Impl, Button*, void);
DECL_LINK_TYPED(SelectHdl_Impl, ListBox&, void);
DECL_LINK_TYPED(DblClickHdl_Impl, ListBox&, void);
DECL_LINK_TYPED(RemoveHdl_Impl, Button*, void);
+DECL_LINK_TYPED(EditHdl_Impl, Button*, void);
+
inline void EnableRemoveButton()
{ m_pRemoveBtn->Enable(
m_pAssignedList->GetSelectEntryPos()
!= LISTBOX_ENTRY_NOTFOUND ); }
+inline void EnableEditButton()
+{ m_pEditBtn->Enable(
+m_pAssignedList->GetSelectEntryPos()
+!= LISTBOX_ENTRY_NOTFOUND ); }
+
+inline void EnableAssignButton()
+{ m_pAssignBtn->Enable(
+true ); }
+
+inline void DisableRemoveButton()
+{ m_pRemoveBtn->Disable(
+true ); }
+
+inline void DisableEditButton()
+{ m_pEditBtn->Disable(
+true ); }
+
+
public:
explicit SvxJavaParameterDlg( vcl::Window* pParent );
virtual ~SvxJavaParameterDlg();
@@ -172,6 +194,7 @@ private:
{ m_pRemoveBtn->Enable(
m_pPathList->
[Libreoffice-commits] core.git: 2 commits - dbaccess/source
dbaccess/source/core/misc/dsntypes.cxx |2 +-
dbaccess/source/inc/dsntypes.hxx | 12 ++--
dbaccess/source/ui/dlg/ConnectionPageSetup.cxx |5 +
3 files changed, 12 insertions(+), 7 deletions(-)
New commits:
commit 82b4afb4295a58c1afee39877a894136d68111ec
Author: akki95
Date: Tue Jan 26 03:52:42 2016 +0530
whitespace fixup
Change-Id: Ia5a2cd92e069c038f4ff0c97876b95c5d81e4db1
diff --git a/dbaccess/source/core/misc/dsntypes.cxx
b/dbaccess/source/core/misc/dsntypes.cxx
index 8f90a1a..fe94d2e 100644
--- a/dbaccess/source/core/misc/dsntypes.cxx
+++ b/dbaccess/source/core/misc/dsntypes.cxx
@@ -401,7 +401,7 @@ DATASOURCE_TYPE ODsnTypeCollection::determineType(const
OUString& _rDsn) const
KnownPrefix( "sdbc:mysql:jdbc:",DST_MYSQL_JDBC, false ),
KnownPrefix( "sdbc:mysql:mysqlc:", DST_MYSQL_NATIVE, false ),
KnownPrefix( "sdbc:mysqlc:",DST_MYSQL_NATIVE_DIRECT,false ),
-KnownPrefix( "sdbc:postgresql:",DST_POSTGRES,false ),
+KnownPrefix( "sdbc:postgresql:",DST_POSTGRES ,false ),
KnownPrefix( "sdbc:address:mozilla:", DST_MOZILLA,
true ),
KnownPrefix( "sdbc:address:thunderbird:", DST_THUNDERBIRD,
true ),
diff --git a/dbaccess/source/inc/dsntypes.hxx b/dbaccess/source/inc/dsntypes.hxx
index 9ce1f7c..8de9a93 100644
--- a/dbaccess/source/inc/dsntypes.hxx
+++ b/dbaccess/source/inc/dsntypes.hxx
@@ -46,22 +46,22 @@ enum DATASOURCE_TYPE
DST_ODBC= 10,
DST_ADO = 11,
DST_MOZILLA = 12,
- DST_THUNDERBIRD = 13,
+DST_THUNDERBIRD = 13,
DST_LDAP= 14,
DST_OUTLOOK = 15,
DST_OUTLOOKEXP = 16,
DST_EVOLUTION = 17,
DST_EVOLUTION_GROUPWISE = 18,
DST_EVOLUTION_LDAP = 19,
- DST_KAB = 20,
- DST_MACAB = 21,
+DST_KAB = 20,
+DST_MACAB = 21,
DST_MSACCESS_2007 = 22,
- DST_EMBEDDED_HSQLDB= 23,
+DST_EMBEDDED_HSQLDB = 23,
DST_MYSQL_NATIVE= 24,
DST_MYSQL_NATIVE_DIRECT = 25,
DST_FIREBIRD= 26,
-DST_EMBEDDED_FIREBIRD= 27,
-DST_POSTGRES = 28,
+DST_EMBEDDED_FIREBIRD = 27,
+DST_POSTGRES= 28,
DST_USERDEFINE1,/// first user defined driver
DST_USERDEFINE2,
commit 90e18b514f639827091cee0f04892d999046eb18
Author: akki95
Date: Tue Jan 26 03:52:42 2016 +0530
tdf#45775 PgSQL new DB allow empty Datasource
Change-Id: I5d672629ddf7f153f0ad1927f0f6c0ffc545c3ab
diff --git a/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx
b/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx
index 21e1ea3..864b406 100644
--- a/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx
+++ b/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx
@@ -138,6 +138,9 @@ namespace dbaui
//! TODO
//if ( ::dbaccess::DST_ORACLE_JDBC == m_eType )
//m_eType = ::dbaccess::DST_JDBC;
+if(m_pCollection->determineType(m_eType) == ::dbaccess::DST_POSTGRES){
+SetRoadmapStateValue(true);
+}
OConnectionHelper::implInitControls(_rSet, _bSaveValue);
@@ -168,6 +171,8 @@ namespace dbaui
}
bool OConnectionTabPageSetup::checkTestConnection()
{
+if ( m_pCollection->determineType(m_eType) ==
::dbaccess::DST_POSTGRES )
+return true;
return !m_pConnectionURL->IsVisible() ||
!m_pConnectionURL->GetTextNoPrefix().isEmpty();
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/tools svtools/source
include/tools/color.hxx|2 ++ svtools/source/config/colorcfg.cxx |4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) New commits: commit 45e3e87ddcdfb14186ce6a9d8748fa4b31393600 Author: akki95 Date: Sun Jan 24 01:02:39 2016 +0530 tdf#87933 - Easier visibility of automatic page breaks. Defined additional named colors COL_GRAY3 and COL_gray7 in color.hxx Fixed the color scheme as required. Change-Id: Ia86acb2465d0978d08518f0a146df5574cc8fafc Reviewed-on: https://gerrit.libreoffice.org/21742 Reviewed-by: jan iversen Tested-by: jan iversen diff --git a/include/tools/color.hxx b/include/tools/color.hxx index 9162a9f..e7fb8ec 100644 --- a/include/tools/color.hxx +++ b/include/tools/color.hxx @@ -44,6 +44,8 @@ typedef sal_uInt32 ColorData; #define COL_MAGENTA RGB_COLORDATA( 0x80, 0x00, 0x80 ) #define COL_BROWN RGB_COLORDATA( 0x80, 0x80, 0x00 ) #define COL_GRAYRGB_COLORDATA( 0x80, 0x80, 0x80 ) +#define COL_GRAY3 RGB_COLORDATA( 0xCC, 0xCC, 0xCC ) +#define COL_GRAY7 RGB_COLORDATA( 0x66, 0x66, 0x66 ) #define COL_LIGHTGRAY RGB_COLORDATA( 0xC0, 0xC0, 0xC0 ) #define COL_LIGHTBLUE RGB_COLORDATA( 0x00, 0x00, 0xFF ) #define COL_LIGHTGREEN RGB_COLORDATA( 0x00, 0xFF, 0x00 ) diff --git a/svtools/source/config/colorcfg.cxx b/svtools/source/config/colorcfg.cxx index 1abdc6c..bb6db69 100644 --- a/svtools/source/config/colorcfg.cxx +++ b/svtools/source/config/colorcfg.cxx @@ -437,10 +437,10 @@ Color ColorConfig::GetDefaultColor(ColorConfigEntry eEntry) COL_LIGHTGREEN, // HTMLCOMMENT COL_LIGHTRED, // HTMLKEYWORD COL_GRAY, // HTMLUNKNOWN -0xcc, // CALCGRID +COL_GRAY3, // CALCGRID COL_BLUE, //CALCPAGEBREAK 0x2300dc, //CALCPAGEBREAKMANUAL -0x66, //CALCPAGEBREAKAUTOMATIC +COL_GRAY7, //CALCPAGEBREAKAUTOMATIC COL_LIGHTBLUE, // CALCDETECTIVE COL_LIGHTRED, // CALCDETECTIVEERROR 0xef0fff, // CALCREFERENCE ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
