track FloatingWindows in need of conversion

Change-Id: Idf4ef59721872165c51ebb2e728b4c6e3f3d90ec

1 files changed, 16 insertions, 17 deletions

diff --git a/bin/count-todo-dialogs b/bin/count-todo-dialogs
index 722e029893eb..340fd564caef 100755
--- a/bin/count-todo-dialogs
+++ b/bin/count-todo-dialogs
@@ -13,28 +13,27 @@
 converted=`ls */uiconfig/ui/*.ui */uiconfig/*/ui/*.ui|wc -l`
 echo $converted .ui files currently exist
 
-dialogs=`git grep -h Dialog -- *.src|grep -v DialogControl|grep -v HelpID|grep -v define|grep -v String|grep -v QuickHelpText|grep -v "Text \[ en-US \]"|grep -v HelpId|grep -v "Cancel-Button"|grep -v \"Dialog\"|grep -v "Dialog Controls" |grep -v .uno:|grep -v "//"|grep -v "*/"|grep -v include|grep -v "paste region"|grep -v "Tabpage-Dialog"|sed -e 's/^ *//g' -e 's/ *$//g'|cut -d' ' -f2- |sort|uniq|wc -l`
-
-tabpages=`git grep -h TabPage -- *.src|grep -v DialogControl|grep -v HelpID|grep -v define|grep -v String|grep -v QuickHelpText|grep -v "Text \[ en-US \]"|grep -v HelpId|grep -v "Cancel-Button"|grep -v \"Dialog\"|grep -v "Dialog Controls" |grep -v .uno:|grep -v "//"|grep -v "*/"|grep -v include|grep -v "paste region"|grep -v "Tabpage-Dialog"|sed -e 's/^ *//g' -e 's/ *$//g'|cut -d' ' -f2- |sort|uniq|wc -l`
+dialogs=0
+tabpages=0
+errorboxes=0
+infoboxes=0
+queryboxes=0
+warningboxes=0
+msgboxes=0
+floatingwindows=`git grep -h FloatingWindow -- *.src|grep -v HelpID|cut -d' ' -f2- |sort|uniq|wc -l`
 
 echo There are $dialogs unconverted dialogs
 echo There are $tabpages unconverted tabpages
-
-num=$(($dialogs + $tabpages))
+echo There are $errorboxes unconverted errorboxes
+echo There are $infoboxes unconverted infoboxes
+echo There are $queryboxes unconverted queryboxes
+echo There are $warningboxes unconverted warningboxes
+echo There are $msgboxes unconverted msgboxes
+echo There are $floatingwindows unconverted floatingwindows
+
+num=$(($floatingwindows))
 echo An estimated additional $num .ui are required
 
 percent=$(($converted * 100 / ($num + $converted)))
 echo We are $percent% of the way through the .ui conversion.
 
-errorboxes=`git grep -h ErrorBox -- *.src|cut -d' ' -f2- |sort|uniq|wc -l`
-infoboxes=`git grep -h InfoBox -- *.src|cut -d' ' -f2- |sort|uniq|wc -l`
-queryboxes=`git grep -h QueryBox -- *.src|cut -d' ' -f2- |sort|uniq|wc -l`
-warningboxes=`git grep -h WarningBox -- *.src|cut -d' ' -f2- |sort|uniq|wc -l`
-msgboxes=`git grep -h MessBox -- *.src|cut -d' ' -f2- |sort|uniq|wc -l`
-
-echo
-echo We need to reduce $errorboxes ErrorBox to basic strings as arguments to MessageDialog
-echo We need to reduce $infoboxes InfoBox to basic strings as arguments to MessageDialog
-echo We need to reduce $queryboxes QueryBox to basic strings as arguments to MessageDialog
-echo We need to reduce $warningboxes WarningBox to basic strings as arguments to MessageDialog
-echo We need to reduce $msgboxes MessBox to basic strings as arguments to MessageDialog