From calligra-devel Mon Feb 18 17:47:12 2013 From: "Thorsten Zachmann" Date: Mon, 18 Feb 2013 17:47:12 +0000 To: calligra-devel Subject: Re: Review Request 109002: Turning stage into modebox Message-Id: <20130218174712.21714.1325 () vidsolbach ! de> X-MARC-Message: https://marc.info/?l=calligra-devel&m=136120964631321 MIME-Version: 1 Content-Type: multipart/mixed; boundary="--===============6870500220887526919==" --===============6870500220887526919== Content-Type: multipart/alternative; boundary="===============1501158420686070319==" --===============1501158420686070319== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit ----------------------------------------------------------- This is an automatically generated e-mail. To reply, visit: http://git.reviewboard.kde.org/r/109002/#review27643 ----------------------------------------------------------- libs/kopageapp/KoPAView.cpp The bool should be changed to a flag so it easier to add other flags if needed. libs/kopageapp/KoPAView.cpp The if shell() should be moved to the outside of the if as it is used in both so only one if will be needed. libs/kopageapp/tools/backgroundTool/CMakeLists.txt These changes look suspisous. What is the reason for those? libs/kopageapp/tools/backgroundTool/KoPABackgroundTool.h Why is this export needed? libs/kopageapp/tools/backgroundTool/KoPABackgroundToolFactory.cpp As said in the TODO this should use Slide design in Stage and Page design in Flow. - Thorsten Zachmann On Feb. 18, 2013, 9:14 a.m., Jean-Nicolas Artaud wrote: > > ----------------------------------------------------------- > This is an automatically generated e-mail. To reply, visit: > http://git.reviewboard.kde.org/r/109002/ > ----------------------------------------------------------- > > (Updated Feb. 18, 2013, 9:14 a.m.) > > > Review request for Calligra and C. Boemann. > > > Description > ------- > > Turns stage into modebox. > Totaly remove the Stroke and Fill docker. > Add the background fill widget, especialy needed in stage. > > > Diffs > ----- > > flow/part/FlowView.cpp b30dbe9 > libs/kopageapp/CMakeLists.txt 35db53f > libs/kopageapp/KoPAView.h 80b9f78 > libs/kopageapp/KoPAView.cpp 58b4940 > libs/kopageapp/tools/backgroundTool/BackgroundToolWidget.ui 937e569 > libs/kopageapp/tools/backgroundTool/CMakeLists.txt 339c671 > libs/kopageapp/tools/backgroundTool/KoPABackgroundTool.h 45a240f > libs/kopageapp/tools/backgroundTool/KoPABackgroundTool.cpp 69f7649 > libs/kopageapp/tools/backgroundTool/KoPABackgroundToolFactory.h cb75621 > libs/kopageapp/tools/backgroundTool/KoPABackgroundToolFactory.cpp b803e79 > libs/kopageapp/tools/backgroundTool/KoPABackgroundToolWidget.cpp c0c5afa > libs/kopageapp/widgets/KoPABackgroundFillWidget.h PRE-CREATION > libs/kopageapp/widgets/KoPABackgroundFillWidget.cpp PRE-CREATION > libs/widgets/KoFillConfigWidget.h 04b185a > libs/widgets/KoFillConfigWidget.cpp d086eb7 > plugins/dockers/CMakeLists.txt dde9e22 > plugins/dockers/Plugin.cpp 9b6c442 > plugins/dockers/styledocker/StrokeFillWidget.h 212eaa0 > plugins/dockers/styledocker/StrokeFillWidget.cpp d67cabf > plugins/dockers/styledocker/StyleButtonBox.h e2957fa > plugins/dockers/styledocker/StyleButtonBox.cpp 291a5af > plugins/dockers/styledocker/StyleDocker.h 13cf77f > plugins/dockers/styledocker/StyleDocker.cpp ffec9c4 > plugins/dockers/styledocker/StyleDockerFactory.h acd91ac > plugins/dockers/styledocker/StyleDockerFactory.cpp 5898610 > plugins/dockers/styledocker/StylePreview.h db33b3f > plugins/dockers/styledocker/StylePreview.cpp 39f8b42 > plugins/textshape/dialogs/SimpleTableWidget.ui cf9efa0 > stage/part/CMakeLists.txt de57a0f > stage/part/KPrPageLayoutWidget.h PRE-CREATION > stage/part/KPrPageLayoutWidget.cpp PRE-CREATION > stage/part/KPrView.cpp 078b34b > stage/part/dockers/KPrPageLayoutDocker.h ed7a547 > stage/part/dockers/KPrPageLayoutDocker.cpp e0e3113 > > Diff: http://git.reviewboard.kde.org/r/109002/diff/ > > > Testing > ------- > > I played around with the stage-designtool2-boemann branch. > > > Thanks, > > Jean-Nicolas Artaud > > --===============1501158420686070319== Content-Type: text/html; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit
This is an automatically generated e-mail. To reply, visit: http://git.reviewboard.kde.org/r/109002/

libs/kopageapp/KoPAView.cpp (Diff revision 1) 
KoPAView::KoPAView(KoPart *part, KoPADocument *document, QWidget *parent)
 


  

 



 
 

 

  

    163
    
KoPAView::KoPAView(KoPart *part, KoPADocument *document, QWidget *parent)

    164
    
KoPAView::KoPAView(KoPart *part, KoPADocument *document, bool withModeBox, QWidget *parent)

  


 





The bool should be changed to a flag so it easier to add other flags if needed.














 
  

   
    libs/kopageapp/KoPAView.cpp
    

     (Diff revision 1)

    
   
  

 

 
  


   
void KoPAView::initGUI()

   
void KoPAView::initGUI(bool withModeBox)


  

 



 
 

 

  

    
    

    320
    
        if (shell()) {

  


 





The if shell() should be moved to the outside of the if as it is used in both so only one if will be needed.














 
  

   
    libs/kopageapp/tools/backgroundTool/CMakeLists.txt
    

     (Diff revision 1)

    
   
  

 



 
 

 

  

    1
    
include_directories( ../.. )

    1
    
include_directories( ../.. )

  


  

    2
    

    2
    

  


  

    3
    
set(kopabackgroundtool_PART_SRCS

    3
    
set(kopabackgroundtool_PART_SRCS

  


  

    4
    
    Plugin.cpp

    4
    
    Plugin.cpp

  


 


 
 

 

  

    5
    
    KoPABackgroundTool.cpp

    
    

  


 


 
 

 

  

    6
    
    KoPABackgroundToolFactory.cpp

    5
    
    KoPABackgroundToolFactory.cpp

  


 


 
 

 

  

    7
    
    KoPABackgroundToolWidget.cpp

    
    

  


 


 
 

 

  

    8
    
    KoPAMasterPageDocker.cpp

    6
    
    KoPAMasterPageDocker.cpp

  


  

    9
    
)

    7
    
)

  


  

    10
    

    8
    

  


  

    11
    

    9
    

  


 


 
 

 

  

    12
    
kde4_add_ui_files(kopabackgroundtool_PART_SRCS

    
    

  


  

    13
    
    BackgroundToolWidget.ui

    
    

  


  

    14
    
)

    
    

  


  

    15
    

    
    

  


  

    16
    

    
    

  


 


 
 

 

  

    17
    
kde4_add_plugin(kopabackgroundtool ${kopabackgroundtool_PART_SRCS})

    10
    
kde4_add_plugin(kopabackgroundtool ${kopabackgroundtool_PART_SRCS})

  


  

    18
    

    11
    

  


  

    19
    
target_link_libraries(

    12
    
target_link_libraries(

  


  

    20
    
    kopabackgroundtool

    13
    
    kopabackgroundtool

  


  

    21
    
    kopageapp

    14
    
    kopageapp

  


 


 
 

 

  

    22
    
    ${KDE4_KIO_LIBRARY}

    15
    
    ${KDE4_KIO_LIBRARY}

  


  

    23
    
    ${KDE4_PHONON_LIBRARY}

    16
    
    ${KDE4_PHONON_LIBRARY}

  


  

    24
    
)

    17
    
)

  


  

    25
    

    18
    

  


  

    26
    
install(TARGETS kopabackgroundtool  DESTINATION ${PLUGIN_INSTALL_DIR})

    19
    
install(TARGETS kopabackgroundtool  DESTINATION ${PLUGIN_INSTALL_DIR})

  


  

    27
    

    20
    

  


 


 
 

 

  

    28
    

    21
    

  


  

    29
    
########### install files ###############

    22
    
########### install files ###############

  


  

    30
    

    23
    

  


  

    31
    
install( FILES  kopabackgroundtool.desktop  DESTINATION ${SERVICES_INSTALL_DIR})

    24
    
install( FILES  kopabackgroundtool.desktop  DESTINATION ${SERVICES_INSTALL_DIR})

  


  

    32
    

    25
    

  


 


 
 

 

  

    
    

    26
    
install(FILES

  


  

    
    

    27
    
    KoPABackgroundTool.h

  


  

    
    

    28
    
    DESTINATION

  


  

    
    

    29
    
    ${INCLUDE_INSTALL_DIR} COMPONENT Devel

  


  

    
    

    30
    
)

  


  

    
    

    31
    

  


 





These changes look suspisous. What is the reason for those?














 
  

   
    libs/kopageapp/tools/backgroundTool/KoPABackgroundTool.h
    

     (Diff revision 1)

    
   
  

 

 
  


   
class KoPABackgroundTool : public KoToolBase

   


  

 



 
 

 

  

    28
    
class KoPABackgroundTool : public KoToolBase

    30
    
class KOPAGEAPP_EXPORT KoPABackgroundTool : public KoToolBase

  


 





Why is this export needed?














 
  

   
    libs/kopageapp/tools/backgroundTool/KoPABackgroundToolFactory.cpp
    

     (Diff revision 1)

    
   
  

 



 
 

 

  

    32
    
    setToolTip(i18n("Document background"));

    32
    
    setToolTip(i18n("Slide design"));

  


 





As said in the TODO this should use Slide design in Stage and Page design in Flow.









- Thorsten






On February 18th, 2013, 9:14 a.m. UTC, Jean-Nicolas Artaud wrote:











 

  


Review request for Calligra and C. Boemann.


By Jean-Nicolas Artaud.




Updated Feb. 18, 2013, 9:14 a.m.








Description 

 

 

  
   
Turns stage into modebox.
Totaly remove the Stroke and Fill docker.
Add the background fill widget, especialy needed in stage.

  		
 






Testing 



 

  
   
I played around with the stage-designtool2-boemann branch.

  		
 








Diffs 


    

 
  • flow/part/FlowView.cpp (b30dbe9)
    • 

 
  • libs/kopageapp/CMakeLists.txt (35db53f)
    • 

 
  • libs/kopageapp/KoPAView.h (80b9f78)
    • 

 
  • libs/kopageapp/KoPAView.cpp (58b4940)
    • 

 
  • libs/kopageapp/tools/backgroundTool/BackgroundToolWidget.ui (937e569)
    • 

 
  • libs/kopageapp/tools/backgroundTool/CMakeLists.txt (339c671)
    • 

 
  • libs/kopageapp/tools/backgroundTool/KoPABackgroundTool.h (45a240f)
    • 

 
  • libs/kopageapp/tools/backgroundTool/KoPABackgroundTool.cpp (69f7649)
    • 

 
  • libs/kopageapp/tools/backgroundTool/KoPABackgroundToolFactory.h (cb75621)
    • 

 
  • libs/kopageapp/tools/backgroundTool/KoPABackgroundToolFactory.cpp (b803e79)
    • 

 
  • libs/kopageapp/tools/backgroundTool/KoPABackgroundToolWidget.cpp (c0c5afa)
    • 

 
  • libs/kopageapp/widgets/KoPABackgroundFillWidget.h (PRE-CREATION)
    • 

 
  • libs/kopageapp/widgets/KoPABackgroundFillWidget.cpp (PRE-CREATION)
    • 

 
  • libs/widgets/KoFillConfigWidget.h (04b185a)
    • 

 
  • libs/widgets/KoFillConfigWidget.cpp (d086eb7)
    • 

 
  • plugins/dockers/CMakeLists.txt (dde9e22)
    • 

 
  • plugins/dockers/Plugin.cpp (9b6c442)
    • 

 
  • plugins/dockers/styledocker/StrokeFillWidget.h (212eaa0)
    • 

 
  • plugins/dockers/styledocker/StrokeFillWidget.cpp (d67cabf)
    • 

 
  • plugins/dockers/styledocker/StyleButtonBox.h (e2957fa)
    • 

 
  • plugins/dockers/styledocker/StyleButtonBox.cpp (291a5af)
    • 

 
  • plugins/dockers/styledocker/StyleDocker.h (13cf77f)
    • 

 
  • plugins/dockers/styledocker/StyleDocker.cpp (ffec9c4)
    • 

 
  • plugins/dockers/styledocker/StyleDockerFactory.h (acd91ac)
    • 

 
  • plugins/dockers/styledocker/StyleDockerFactory.cpp (5898610)
    • 

 
  • plugins/dockers/styledocker/StylePreview.h (db33b3f)
    • 

 
  • plugins/dockers/styledocker/StylePreview.cpp (39f8b42)
    • 

 
  • plugins/textshape/dialogs/SimpleTableWidget.ui (cf9efa0)
    • 

 
  • stage/part/CMakeLists.txt (de57a0f)
    • 

 
  • stage/part/KPrPageLayoutWidget.h (PRE-CREATION)
    • 

 
  • stage/part/KPrPageLayoutWidget.cpp (PRE-CREATION)
    • 

 
  • stage/part/KPrView.cpp (078b34b)
    • 

 
  • stage/part/dockers/KPrPageLayoutDocker.h (ed7a547)
    • 

 
  • stage/part/dockers/KPrPageLayoutDocker.cpp (e0e3113)
    • 





View Diff








  		
 











  

 



--===============1501158420686070319==--

--===============6870500220887526919==
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

_______________________________________________
calligra-devel mailing list
calligra-devel@kde.org
https://mail.kde.org/mailman/listinfo/calligra-devel

--===============6870500220887526919==--