diff options
author | Caolán McNamara <caolanm@redhat.com> | 2013-04-16 15:51:19 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2013-04-16 20:15:17 +0100 |
commit | ddc27e4d5496edd558d48747b8830d393550aa30 (patch) | |
tree | 15a20b690019fb11f430e2262dcca1f55292fbe8 /sc | |
parent | Revert "add missing include" (diff) | |
download | core-ddc27e4d5496edd558d48747b8830d393550aa30.tar.gz core-ddc27e4d5496edd558d48747b8830d393550aa30.zip |
adapt code to goal seek dialog .ui conversion
Change-Id: Ic3edf3f42365630c903f4e2cf63103a8f59311bb
Diffstat (limited to 'sc')
-rw-r--r-- | sc/AllLangResTarget_sc.mk | 1 | ||||
-rw-r--r-- | sc/UIConfig_scalc.mk | 1 | ||||
-rw-r--r-- | sc/inc/globstr.hrc | 7 | ||||
-rw-r--r-- | sc/source/ui/inc/solvrdlg.hrc | 39 | ||||
-rw-r--r-- | sc/source/ui/inc/solvrdlg.hxx | 21 | ||||
-rw-r--r-- | sc/source/ui/miscdlgs/solvrdlg.cxx | 118 | ||||
-rw-r--r-- | sc/source/ui/src/globstr.src | 16 | ||||
-rw-r--r-- | sc/source/ui/src/solvrdlg.src | 133 | ||||
-rw-r--r-- | sc/uiconfig/scalc/ui/goalseekdlg.ui | 39 |
9 files changed, 117 insertions, 258 deletions
diff --git a/sc/AllLangResTarget_sc.mk b/sc/AllLangResTarget_sc.mk index ff58ce3f5312..2f079c6ad226 100644 --- a/sc/AllLangResTarget_sc.mk +++ b/sc/AllLangResTarget_sc.mk @@ -60,7 +60,6 @@ $(eval $(call gb_SrsTarget_add_files,sc/res,\ sc/source/ui/src/toolbox.src \ sc/source/ui/src/scfuncs.src \ sc/source/ui/src/textdlgs.src \ - sc/source/ui/src/solvrdlg.src \ sc/source/ui/src/sc.src \ sc/source/ui/src/pseudo.src \ sc/source/ui/src/subtdlg.src \ diff --git a/sc/UIConfig_scalc.mk b/sc/UIConfig_scalc.mk index 07cb7bed0227..5c7e11e8bd89 100644 --- a/sc/UIConfig_scalc.mk +++ b/sc/UIConfig_scalc.mk @@ -67,6 +67,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/scalc,\ sc/uiconfig/scalc/ui/deletecontents \ sc/uiconfig/scalc/ui/externaldata \ sc/uiconfig/scalc/ui/formatcellsdialog \ + sc/uiconfig/scalc/ui/goalseekdlg \ sc/uiconfig/scalc/ui/insertname \ sc/uiconfig/scalc/ui/insertsheet \ sc/uiconfig/scalc/ui/managenamesdialog \ diff --git a/sc/inc/globstr.hrc b/sc/inc/globstr.hrc index 058349eb884a..6392110d88ce 100644 --- a/sc/inc/globstr.hrc +++ b/sc/inc/globstr.hrc @@ -670,7 +670,12 @@ #define STR_MULTI_SELECT 537 -#define STR_COUNT 538 +#define STR_INVALIDVAL 538 +#define STR_INVALIDVAR 539 +#define STR_INVALIDFORM 540 +#define STR_NOFORMULA 541 + +#define STR_COUNT 542 #endif diff --git a/sc/source/ui/inc/solvrdlg.hrc b/sc/source/ui/inc/solvrdlg.hrc deleted file mode 100644 index 1881a4cb9016..000000000000 --- a/sc/source/ui/inc/solvrdlg.hrc +++ /dev/null @@ -1,39 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include "sc.hrc" // ->RID_SCDLG_SOLVER - -#define ED_FORMULACELL 1 -#define ED_TARGETVAL 2 -#define ED_VARCELL 3 -#define FT_FORMULACELL 1 -#define FT_TARGETVAL 2 -#define FT_VARCELL 3 -#define RB_FORMULACELL 1 -#define RB_VARCELL 2 -#define FL_VARIABLES 1 -#define BTN_OK 1 -#define BTN_CANCEL 2 -#define BTN_HELP 1 -#define STR_INVALIDVAL 1 -#define STR_INVALIDVAR 2 -#define STR_INVALIDFORM 3 -#define STR_NOFORMULA 4 - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/solvrdlg.hxx b/sc/source/ui/inc/solvrdlg.hxx index 30290c0133fe..871bde469145 100644 --- a/sc/source/ui/inc/solvrdlg.hxx +++ b/sc/source/ui/inc/solvrdlg.hxx @@ -55,21 +55,18 @@ public: virtual sal_Bool Close(); private: - FixedLine aFlVariables; - FixedText aFtFormulaCell; - formula::RefEdit aEdFormulaCell; - formula::RefButton aRBFormulaCell; + FixedText* m_pFtFormulaCell; + formula::RefEdit* m_pEdFormulaCell; + formula::RefButton* m_pRBFormulaCell; - FixedText aFtTargetVal; - Edit aEdTargetVal; + Edit* m_pEdTargetVal; - FixedText aFtVariableCell; - formula::RefEdit aEdVariableCell; - formula::RefButton aRBVariableCell; + FixedText* m_pFtVariableCell; + formula::RefEdit* m_pEdVariableCell; + formula::RefButton* m_pRBVariableCell; - OKButton aBtnOk; - CancelButton aBtnCancel; - HelpButton aBtnHelp; + OKButton* m_pBtnOk; + CancelButton* m_pBtnCancel; ScAddress theFormulaCell; ScAddress theVariableCell; diff --git a/sc/source/ui/miscdlgs/solvrdlg.cxx b/sc/source/ui/miscdlgs/solvrdlg.cxx index 1c210a37f219..e5a69be23d25 100644 --- a/sc/source/ui/miscdlgs/solvrdlg.cxx +++ b/sc/source/ui/miscdlgs/solvrdlg.cxx @@ -27,7 +27,8 @@ #include "reffact.hxx" #include "document.hxx" #include "scresid.hxx" -#include "solvrdlg.hrc" +#include "globstr.hrc" +#include "sc.hrc" #define _SOLVRDLG_CXX #include "solvrdlg.hxx" @@ -45,37 +46,32 @@ ScSolverDlg::ScSolverDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, ScDocument* pDocument, ScAddress aCursorPos ) - : ScAnyRefDlg ( pB, pCW, pParent, RID_SCDLG_SOLVER ), - // - aFlVariables ( this, ScResId( FL_VARIABLES ) ), - aFtFormulaCell ( this, ScResId( FT_FORMULACELL ) ), - aEdFormulaCell ( this, this, ScResId( ED_FORMULACELL ) ), - aRBFormulaCell ( this, ScResId( RB_FORMULACELL ), &aEdFormulaCell, &aFtFormulaCell, this ), - aFtTargetVal ( this, ScResId( FT_TARGETVAL ) ), - aEdTargetVal ( this, ScResId( ED_TARGETVAL ) ), - aFtVariableCell ( this, ScResId( FT_VARCELL ) ), - aEdVariableCell ( this, this, ScResId( ED_VARCELL ) ), - aRBVariableCell ( this, ScResId( RB_VARCELL ), &aEdVariableCell, &aFtVariableCell, this ), - aBtnOk ( this, ScResId( BTN_OK ) ), - aBtnCancel ( this, ScResId( BTN_CANCEL ) ), - aBtnHelp ( this, ScResId( BTN_HELP ) ), - // - theFormulaCell ( aCursorPos ), - theVariableCell ( aCursorPos ), - pDoc ( pDocument ), - nCurTab ( aCursorPos.Tab() ), - pEdActive ( NULL ), - bDlgLostFocus ( false ), - errMsgInvalidVar ( ScResId( STR_INVALIDVAR ) ), - errMsgInvalidForm ( ScResId( STR_INVALIDFORM ) ), - errMsgNoFormula ( ScResId( STR_NOFORMULA ) ), - errMsgInvalidVal ( ScResId( STR_INVALIDVAL ) ) + : ScAnyRefDlg(pB, pCW, pParent, "GoalSeekDialog", "modules/scalc/ui/goalseekdlg.ui") + , theFormulaCell(aCursorPos) + , theVariableCell(aCursorPos) + , pDoc(pDocument) + , nCurTab(aCursorPos.Tab()) + , pEdActive(NULL) + , bDlgLostFocus(false) + , errMsgInvalidVar(ScGlobal::GetRscString(STR_INVALIDVAR)) + , errMsgInvalidForm(ScGlobal::GetRscString(STR_INVALIDFORM)) + , errMsgNoFormula(ScGlobal::GetRscString(STR_NOFORMULA)) + , errMsgInvalidVal(ScGlobal::GetRscString(STR_INVALIDVAL)) { + get(m_pFtFormulaCell, "formulatext"); + get(m_pEdFormulaCell, "formulaedit"); + m_pEdFormulaCell->SetRefDialog(this); + get(m_pRBFormulaCell, "formulabutton"); + m_pRBFormulaCell->SetReferences(this, m_pEdFormulaCell, m_pFtFormulaCell), + get(m_pEdTargetVal, "target"); + get(m_pFtVariableCell, "vartext"); + get(m_pEdVariableCell, "varedit"); + m_pEdVariableCell->SetRefDialog(this); + get(m_pRBVariableCell, "varbutton"); + m_pRBVariableCell->SetReferences(this, m_pEdVariableCell, m_pFtVariableCell); + get(m_pBtnOk, "ok"); + get(m_pBtnCancel, "cancel"); Init(); - FreeResource(); - - aRBFormulaCell.SetAccessibleRelationMemberOf(&aFlVariables); - aRBVariableCell.SetAccessibleRelationMemberOf(&aFlVariables); } //---------------------------------------------------------------------------- @@ -90,27 +86,27 @@ void ScSolverDlg::Init() { String aStr; - aBtnOk. SetClickHdl ( LINK( this, ScSolverDlg, BtnHdl ) ); - aBtnCancel. SetClickHdl ( LINK( this, ScSolverDlg, BtnHdl ) ); + m_pBtnOk->SetClickHdl( LINK( this, ScSolverDlg, BtnHdl ) ); + m_pBtnCancel->SetClickHdl( LINK( this, ScSolverDlg, BtnHdl ) ); Link aLink = LINK( this, ScSolverDlg, GetFocusHdl ); - aEdFormulaCell. SetGetFocusHdl ( aLink ); - aRBFormulaCell. SetGetFocusHdl ( aLink ); - aEdVariableCell.SetGetFocusHdl ( aLink ); - aRBVariableCell.SetGetFocusHdl ( aLink ); - aEdTargetVal. SetGetFocusHdl ( aLink ); + m_pEdFormulaCell->SetGetFocusHdl( aLink ); + m_pRBFormulaCell->SetGetFocusHdl( aLink ); + m_pEdVariableCell->SetGetFocusHdl( aLink ); + m_pRBVariableCell->SetGetFocusHdl( aLink ); + m_pEdTargetVal->SetGetFocusHdl( aLink ); aLink = LINK( this, ScSolverDlg, LoseFocusHdl ); - aEdFormulaCell. SetLoseFocusHdl ( aLink ); - aRBFormulaCell. SetLoseFocusHdl ( aLink ); - aEdVariableCell.SetLoseFocusHdl ( aLink ); - aRBVariableCell.SetLoseFocusHdl ( aLink ); + m_pEdFormulaCell->SetLoseFocusHdl ( aLink ); + m_pRBFormulaCell->SetLoseFocusHdl ( aLink ); + m_pEdVariableCell->SetLoseFocusHdl ( aLink ); + m_pRBVariableCell->SetLoseFocusHdl ( aLink ); theFormulaCell.Format( aStr, SCA_ABS, NULL, pDoc->GetAddressConvention() ); - aEdFormulaCell.SetText( aStr ); - aEdFormulaCell.GrabFocus(); - pEdActive = &aEdFormulaCell; + m_pEdFormulaCell->SetText( aStr ); + m_pEdFormulaCell->GrabFocus(); + pEdActive = m_pEdFormulaCell; } //---------------------------------------------------------------------------- @@ -155,9 +151,9 @@ void ScSolverDlg::SetReference( const ScRange& rRef, ScDocument* pDocP ) aAdr.Format( aStr, nFmt, pDocP, pDocP->GetAddressConvention() ); pEdActive->SetRefString( aStr ); - if ( pEdActive == &aEdFormulaCell ) + if ( pEdActive == m_pEdFormulaCell ) theFormulaCell = aAdr; - else if ( pEdActive == &aEdVariableCell ) + else if ( pEdActive == m_pEdVariableCell ) theVariableCell = aAdr; } } @@ -170,22 +166,22 @@ void ScSolverDlg::RaiseError( ScSolverErr eError ) { case SOLVERR_NOFORMULA: ERRORBOX( errMsgNoFormula ); - aEdFormulaCell.GrabFocus(); + m_pEdFormulaCell->GrabFocus(); break; case SOLVERR_INVALID_FORMULA: ERRORBOX( errMsgInvalidForm ); - aEdFormulaCell.GrabFocus(); + m_pEdFormulaCell->GrabFocus(); break; case SOLVERR_INVALID_VARIABLE: ERRORBOX( errMsgInvalidVar ); - aEdVariableCell.GrabFocus(); + m_pEdVariableCell->GrabFocus(); break; case SOLVERR_INVALID_TARGETVALUE: ERRORBOX( errMsgInvalidVal ); - aEdTargetVal.GrabFocus(); + m_pEdTargetVal->GrabFocus(); break; } } @@ -212,9 +208,9 @@ sal_Bool ScSolverDlg::CheckTargetValue( String& rStrVal ) IMPL_LINK( ScSolverDlg, BtnHdl, PushButton*, pBtn ) { - if ( pBtn == &aBtnOk ) + if (pBtn == m_pBtnOk) { - theTargetValStr = aEdTargetVal.GetText(); + theTargetValStr = m_pEdTargetVal->GetText(); // Zu ueberpruefen: // 1. enthalten die Strings korrekte Tabellenkoordinaten/def.Namen? @@ -222,8 +218,8 @@ IMPL_LINK( ScSolverDlg, BtnHdl, PushButton*, pBtn ) // 3. wurde ein korrekter Zielwert eingegeben const formula::FormulaGrammar::AddressConvention eConv = pDoc->GetAddressConvention(); - sal_uInt16 nRes1 = theFormulaCell .Parse( aEdFormulaCell.GetText(), pDoc, eConv ); - sal_uInt16 nRes2 = theVariableCell.Parse( aEdVariableCell.GetText(), pDoc, eConv ); + sal_uInt16 nRes1 = theFormulaCell .Parse( m_pEdFormulaCell->GetText(), pDoc, eConv ); + sal_uInt16 nRes2 = theVariableCell.Parse( m_pEdVariableCell->GetText(), pDoc, eConv ); if ( SCA_VALID == ( nRes1 & SCA_VALID ) ) { @@ -260,7 +256,7 @@ IMPL_LINK( ScSolverDlg, BtnHdl, PushButton*, pBtn ) } else RaiseError( SOLVERR_INVALID_FORMULA ); } - else if ( pBtn == &aBtnCancel ) + else if (pBtn == m_pBtnCancel) { Close(); } @@ -275,12 +271,12 @@ IMPL_LINK( ScSolverDlg, GetFocusHdl, Control*, pCtrl ) Edit* pEdit = NULL; pEdActive = NULL; - if( (pCtrl == (Control*)&aEdFormulaCell) || (pCtrl == (Control*)&aRBFormulaCell) ) - pEdit = pEdActive = &aEdFormulaCell; - else if( (pCtrl == (Control*)&aEdVariableCell) || (pCtrl == (Control*)&aRBVariableCell) ) - pEdit = pEdActive = &aEdVariableCell; - else if( pCtrl == (Control*)&aEdTargetVal ) - pEdit = &aEdTargetVal; + if( (pCtrl == (Control*)m_pEdFormulaCell) || (pCtrl == (Control*)m_pRBFormulaCell) ) + pEdit = pEdActive = m_pEdFormulaCell; + else if( (pCtrl == (Control*)m_pEdVariableCell) || (pCtrl == (Control*)m_pRBVariableCell) ) + pEdit = pEdActive = m_pEdVariableCell; + else if( pCtrl == (Control*)m_pEdTargetVal ) + pEdit = m_pEdTargetVal; if( pEdit ) pEdit->SetSelection( Selection( 0, SELECTION_MAX ) ); diff --git a/sc/source/ui/src/globstr.src b/sc/source/ui/src/globstr.src index 297324000b02..54001c49ac14 100644 --- a/sc/source/ui/src/globstr.src +++ b/sc/source/ui/src/globstr.src @@ -2072,6 +2072,22 @@ Resource RID_GLOBSTR { Text [ en-US ] = "Years" ; }; + String STR_INVALIDVAL + { + Text [ en-US ] = "Invalid target value." ; + }; + String STR_INVALIDVAR + { + Text [ en-US ] = "Undefined name for variable cell." ; + }; + String STR_INVALIDFORM + { + Text [ en-US ] = "Undefined name as formula cell." ; + }; + String STR_NOFORMULA + { + Text [ en-US ] = "Cell must contain a formula." ; + }; }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/src/solvrdlg.src b/sc/source/ui/src/solvrdlg.src deleted file mode 100644 index f206ab04d1fa..000000000000 --- a/sc/source/ui/src/solvrdlg.src +++ /dev/null @@ -1,133 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include "solvrdlg.hrc" - -ModelessDialog RID_SCDLG_SOLVER -{ - OutputSize = TRUE ; - HelpId = CMD_SID_OPENDLG_SOLVE ; - Hide = TRUE ; - SVLook = TRUE ; - Size = MAP_APPFONT ( 222 , 64 ) ; - Text [ en-US ] = "Goal Seek" ; - Moveable = TRUE ; - Closeable = FALSE ; - FixedText FT_FORMULACELL - { - Pos = MAP_APPFONT ( 12 , 16 ) ; - Size = MAP_APPFONT ( 50 , 8 ) ; - Text [ en-US ] = "~Formula cell" ; - }; - Edit ED_FORMULACELL - { - HelpID = "sc:Edit:RID_SCDLG_SOLVER:ED_FORMULACELL"; - Border = TRUE ; - Pos = MAP_APPFONT ( 64 , 14 ) ; - Size = MAP_APPFONT ( 79 , 12 ) ; - TabStop = TRUE ; - }; - ImageButton RB_FORMULACELL - { - HelpID = "sc:ImageButton:RID_SCDLG_SOLVER:RB_FORMULACELL"; - Pos = MAP_APPFONT ( 145 , 13 ) ; - Size = MAP_APPFONT ( 13 , 15 ) ; - TabStop = FALSE ; - QuickHelpText [ en-US ] = "Shrink" ; - }; - FixedText FT_TARGETVAL - { - Pos = MAP_APPFONT ( 12 , 32 ) ; - Size = MAP_APPFONT ( 50 , 8 ) ; - Text [ en-US ] = "Target ~value" ; - }; - Edit ED_TARGETVAL - { - HelpID = "sc:Edit:RID_SCDLG_SOLVER:ED_TARGETVAL"; - Border = TRUE ; - Pos = MAP_APPFONT ( 64 , 30 ) ; - Size = MAP_APPFONT ( 93 , 12 ) ; - TabStop = TRUE ; - }; - FixedText FT_VARCELL - { - Pos = MAP_APPFONT ( 12 , 48 ) ; - Size = MAP_APPFONT ( 50 , 8 ) ; - Text [ en-US ] = "Variable ~cell" ; - }; - Edit ED_VARCELL - { - HelpID = "sc:Edit:RID_SCDLG_SOLVER:ED_VARCELL"; - Border = TRUE ; - Pos = MAP_APPFONT ( 64 , 46 ) ; - Size = MAP_APPFONT ( 79 , 12 ) ; - TabStop = TRUE ; - }; - ImageButton RB_VARCELL - { - HelpID = "sc:ImageButton:RID_SCDLG_SOLVER:RB_VARCELL"; - Pos = MAP_APPFONT ( 145 , 45 ) ; - Size = MAP_APPFONT ( 13 , 15 ) ; - TabStop = FALSE ; - QuickHelpText [ en-US ] = "Shrink" ; - }; - FixedLine FL_VARIABLES - { - Pos = MAP_APPFONT ( 6 , 3 ) ; - Size = MAP_APPFONT ( 154 , 8 ) ; - Text [ en-US ] = "Default settings" ; - }; - OKButton BTN_OK - { - DefButton = TRUE ; - Pos = MAP_APPFONT ( 166 , 6 ) ; - Size = MAP_APPFONT ( 50 , 14 ) ; - TabStop = TRUE ; - }; - CancelButton BTN_CANCEL - { - Pos = MAP_APPFONT ( 166 , 23 ) ; - Size = MAP_APPFONT ( 50 , 14 ) ; - TabStop = TRUE ; - }; - HelpButton BTN_HELP - { - Pos = MAP_APPFONT ( 166 , 43 ) ; - Size = MAP_APPFONT ( 50 , 14 ) ; - TabStop = TRUE ; - }; - String STR_INVALIDVAL - { - Text [ en-US ] = "Invalid target value." ; - }; - String STR_INVALIDVAR - { - Text [ en-US ] = "Undefined name for variable cell." ; - }; - String STR_INVALIDFORM - { - Text [ en-US ] = "Undefined name as formula cell." ; - }; - String STR_NOFORMULA - { - Text [ en-US ] = "Cell must contain a formula." ; - }; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/uiconfig/scalc/ui/goalseekdlg.ui b/sc/uiconfig/scalc/ui/goalseekdlg.ui index d9166d33295a..621d55a943a6 100644 --- a/sc/uiconfig/scalc/ui/goalseekdlg.ui +++ b/sc/uiconfig/scalc/ui/goalseekdlg.ui @@ -1,7 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <interface> <!-- interface-requires gtk+ 3.0 --> - <object class="GtkDialog" id="goalseek"> + <!-- interface-requires LibreOffice 1.0 --> + <object class="GtkDialog" id="GoalSeekDialog"> <property name="can_focus">False</property> <property name="border_width">6</property> <property name="title" translatable="yes">Goal Seek</property> @@ -9,7 +10,7 @@ <child internal-child="vbox"> <object class="GtkBox" id="dialog-vbox1"> <property name="can_focus">False</property> - <property name="spacing">2</property> + <property name="spacing">12</property> <child internal-child="action_area"> <object class="GtkButtonBox" id="dialog-action_area1"> <property name="can_focus">False</property> @@ -20,6 +21,8 @@ <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> @@ -69,26 +72,30 @@ <object class="GtkFrame" id="frame1"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="hexpand">True</property> <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> <object class="GtkAlignment" id="alignment1"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="hexpand">True</property> <property name="top_padding">6</property> <property name="left_padding">12</property> <child> <object class="GtkGrid" id="grid1"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="hexpand">True</property> <property name="row_spacing">6</property> <property name="column_spacing">12</property> <child> - <object class="GtkLabel" id="label2"> + <object class="GtkLabel" id="formulatext"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="label" translatable="yes">_Formula cell</property> <property name="use_underline">True</property> + <property name="mnemonic_widget">formulaedit</property> </object> <packing> <property name="left_attach">0</property> @@ -103,6 +110,7 @@ <property name="can_focus">False</property> <property name="label" translatable="yes">Target _value</property> <property name="use_underline">True</property> + <property name="mnemonic_widget">target</property> </object> <packing> <property name="left_attach">0</property> @@ -112,11 +120,12 @@ </packing> </child> <child> - <object class="GtkLabel" id="label4"> + <object class="GtkLabel" id="vartext"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="label" translatable="yes">Variable _cell</property> <property name="use_underline">True</property> + <property name="mnemonic_widget">varedit</property> </object> <packing> <property name="left_attach">0</property> @@ -129,11 +138,14 @@ <object class="GtkBox" id="box1"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="hexpand">True</property> <property name="spacing">6</property> <child> - <object class="GtkEntry" id="entry1"> + <object class="foruilo-RefEdit" id="formulaedit"> <property name="visible">True</property> <property name="can_focus">True</property> + <property name="valign">center</property> + <property name="hexpand">True</property> <property name="invisible_char">•</property> </object> <packing> @@ -143,10 +155,10 @@ </packing> </child> <child> - <object class="GtkImage" id="image1"> + <object class="foruilo-RefButton" id="formulabutton"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="stock">gtk-missing-image</property> + <property name="receives_default">False</property> </object> <packing> <property name="expand">False</property> @@ -163,9 +175,11 @@ </packing> </child> <child> - <object class="GtkEntry" id="entry2"> + <object class="GtkEntry" id="target"> <property name="visible">True</property> <property name="can_focus">True</property> + <property name="valign">center</property> + <property name="hexpand">True</property> <property name="invisible_char">•</property> </object> <packing> @@ -179,11 +193,14 @@ <object class="GtkBox" id="box2"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="hexpand">True</property> <property name="spacing">6</property> <child> - <object class="GtkEntry" id="entry3"> + <object class="foruilo-RefEdit" id="varedit"> <property name="visible">True</property> <property name="can_focus">True</property> + <property name="valign">center</property> + <property name="hexpand">True</property> <property name="invisible_char">•</property> </object> <packing> @@ -193,10 +210,10 @@ </packing> </child> <child> - <object class="GtkImage" id="image2"> + <object class="foruilo-RefButton" id="varbutton"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="stock">gtk-missing-image</property> + <property name="receives_default">False</property> </object> <packing> <property name="expand">False</property> |