diff options
author | Andrej Shadura <andrewsh@debian.org> | 2018-05-08 16:00:42 +0200 |
---|---|---|
committer | Andrej Shadura <andrewsh@debian.org> | 2018-05-08 16:00:42 +0200 |
commit | 2fc4dd61e5607569909548975eaf54cef87be96e (patch) | |
tree | 19417eb5639eacffcfac6d9de53e0ab464010503 /lib/bottompanel | |
parent | 47aa8b00b2b11df13a100489e0f904a4947177ef (diff) |
New upstream version 1.4.9
Diffstat (limited to 'lib/bottompanel')
-rw-r--r-- | lib/bottompanel/bottomnotebook.tcl | 5 | ||||
-rw-r--r-- | lib/bottompanel/calculator.tcl | 19 | ||||
-rw-r--r-- | lib/bottompanel/cvarsview.tcl | 13 | ||||
-rw-r--r-- | lib/bottompanel/find_in_files.tcl | 28 | ||||
-rw-r--r-- | lib/bottompanel/graph.tcl | 9 | ||||
-rw-r--r-- | lib/bottompanel/graph_wdg.tcl | 19 | ||||
-rw-r--r-- | lib/bottompanel/messages.tcl | 15 | ||||
-rw-r--r-- | lib/bottompanel/terminal.tcl | 9 | ||||
-rw-r--r-- | lib/bottompanel/todo.tcl | 31 |
9 files changed, 92 insertions, 56 deletions
diff --git a/lib/bottompanel/bottomnotebook.tcl b/lib/bottompanel/bottomnotebook.tcl index d4d1293..14c5e20 100644 --- a/lib/bottompanel/bottomnotebook.tcl +++ b/lib/bottompanel/bottomnotebook.tcl @@ -1,10 +1,13 @@ #!/usr/bin/tclsh -# Part of MCU 8051 IDE ( http://mcu8051ide.sf.net ) +# Part of MCU 8051 IDE ( http://http://www.moravia-microsystems.com/mcu8051ide ) ############################################################################ # Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012 by Martin Ošmera # # martin.osmera@gmail.com # # # +# Copyright (C) 2014 by Moravia Microsystems, s.r.o. # +# martin.osmera@moravia-microsystems.com # +# # # This program is free software; you can redistribute it and#or modify # # it under the terms of the GNU General Public License as published by # # the Free Software Foundation; either version 2 of the License, or # diff --git a/lib/bottompanel/calculator.tcl b/lib/bottompanel/calculator.tcl index b7ab722..f311cce 100644 --- a/lib/bottompanel/calculator.tcl +++ b/lib/bottompanel/calculator.tcl @@ -1,10 +1,13 @@ #!/usr/bin/tclsh -# Part of MCU 8051 IDE ( http://mcu8051ide.sf.net ) +# Part of MCU 8051 IDE ( http://http://www.moravia-microsystems.com/mcu8051ide ) ############################################################################ # Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012 by Martin Ošmera # # martin.osmera@gmail.com # # # +# Copyright (C) 2014 by Moravia Microsystems, s.r.o. # +# martin.osmera@moravia-microsystems.com # +# # # This program is free software; you can redistribute it and#or modify # # it under the terms of the GNU General Public License as published by # # the Free Software Foundation; either version 2 of the License, or # @@ -33,18 +36,18 @@ set _CALCULATOR_TCL _ class Calculator { - common calc_count 0 ;# counter of instances + public common calc_count 0 ;# counter of instances # Font for numerical keypad - common large_font [font create \ + public common large_font [font create \ -family {helveticat} \ -size [expr {int(-12 * $::font_size_factor)}] \ -weight {bold} \ ] - common oper_fg_color {#0000FF} ;# Foreground color for operator display - common error_bg_color {#FF6666} ;# Background color for display containing too many characters - common display_bg_color {#DDFFDD} ;# Background color for main display - common buffer_bg_color {#DDDDFF} ;# Background color for buffer display + public common oper_fg_color {#0000FF} ;# Foreground color for operator display + public common error_bg_color {#FF6666} ;# Background color for display containing too many characters + public common display_bg_color {#DDFFDD} ;# Background color for main display + public common buffer_bg_color {#DDDDFF} ;# Background color for buffer display # Variables related to object initialization private variable parent ;# Teportary variable -- GUI parent @@ -112,7 +115,7 @@ class Calculator { # {separator} # } # } - common calculator_keyboard { + public common calculator_keyboard { { {{AND} {and} {calc_opr and 1} {} {} {Bit-wise AND} diff --git a/lib/bottompanel/cvarsview.tcl b/lib/bottompanel/cvarsview.tcl index ebebce3..f95ed32 100644 --- a/lib/bottompanel/cvarsview.tcl +++ b/lib/bottompanel/cvarsview.tcl @@ -1,10 +1,13 @@ #!/usr/bin/tclsh -# Part of MCU 8051 IDE ( http://mcu8051ide.sf.net ) +# Part of MCU 8051 IDE ( http://http://www.moravia-microsystems.com/mcu8051ide ) ############################################################################ # Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012 by Martin Ošmera # # martin.osmera@gmail.com # # # +# Copyright (C) 2014 by Moravia Microsystems, s.r.o. # +# martin.osmera@moravia-microsystems.com # +# # # This program is free software; you can redistribute it and#or modify # # it under the terms of the GNU General Public License as published by # # the Free Software Foundation; either version 2 of the License, or # @@ -35,28 +38,28 @@ set _CVARSVIEW_TCL _ class CVarsView { ## COMMON # Normal font fot the text widget - common text_wdg_font_n [font create \ + public common text_wdg_font_n [font create \ -family $::DEFAULT_FIXED_FONT \ -size [expr {int(-12 * $::font_size_factor)}] \ -weight normal \ -slant roman \ ] # Bold font for the text widget - common text_wdg_font_b [font create \ + public common text_wdg_font_b [font create \ -family $::DEFAULT_FIXED_FONT \ -size [expr {int(-12 * $::font_size_factor)}] \ -weight bold \ -slant roman \ ] # Italic font for the text widget - common text_wdg_font_i [font create \ + public common text_wdg_font_i [font create \ -family $::DEFAULT_FIXED_FONT \ -size [expr {int(-12 * $::font_size_factor)}] \ -weight normal \ -slant italic \ ] # Background color for selected lines - common color_selected_line {#CCCCFF} + public common color_selected_line {#CCCCFF} private variable main_frame ;# Widget: Main frame diff --git a/lib/bottompanel/find_in_files.tcl b/lib/bottompanel/find_in_files.tcl index dccc823..e34ab0f 100644 --- a/lib/bottompanel/find_in_files.tcl +++ b/lib/bottompanel/find_in_files.tcl @@ -1,10 +1,13 @@ #!/usr/bin/tclsh -# Part of MCU 8051 IDE ( http://mcu8051ide.sf.net ) +# Part of MCU 8051 IDE ( http://http://www.moravia-microsystems.com/mcu8051ide ) ############################################################################ # Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012 by Martin Ošmera # # martin.osmera@gmail.com # # # +# Copyright (C) 2014 by Moravia Microsystems, s.r.o. # +# martin.osmera@moravia-microsystems.com # +# # # This program is free software; you can redistribute it and#or modify # # it under the terms of the GNU General Public License as published by # # the Free Software Foundation; either version 2 of the License, or # @@ -33,7 +36,7 @@ set _FIND_IN_FILES_TCL _ # -------------------------------------------------------------------------- class FindInFiles { - common find_inf_count 0 ;# Counter of class instances + public common find_inf_count 0 ;# Counter of class instances # Variables related to object initialization private variable parent ;# Widget: parent widget @@ -61,12 +64,21 @@ class FindInFiles { set obj_idx $find_inf_count # Load configuration - set ::FindInFiles::recursive_$obj_idx [lindex $::CONFIG(FIND_IN_FILES_CONFIG) 0] - set ::FindInFiles::regular_expr_$obj_idx [lindex $::CONFIG(FIND_IN_FILES_CONFIG) 1] - set ::FindInFiles::case_sensitive_$obj_idx [lindex $::CONFIG(FIND_IN_FILES_CONFIG) 2] - set ::FindInFiles::folder_$obj_idx [$this cget -projectPath] ;#[lindex $::CONFIG(FIND_IN_FILES_CONFIG) 3] - set ::FindInFiles::mask_$obj_idx [lindex $::CONFIG(FIND_IN_FILES_CONFIG) 4] - set ::FindInFiles::pattern_$obj_idx [lindex $::CONFIG(FIND_IN_FILES_CONFIG) 5] + if {[catch { + set ::FindInFiles::recursive_$obj_idx [lindex $::CONFIG(FIND_IN_FILES_CONFIG) 0] + set ::FindInFiles::regular_expr_$obj_idx [lindex $::CONFIG(FIND_IN_FILES_CONFIG) 1] + set ::FindInFiles::case_sensitive_$obj_idx [lindex $::CONFIG(FIND_IN_FILES_CONFIG) 2] + set ::FindInFiles::folder_$obj_idx [lindex $::CONFIG(FIND_IN_FILES_CONFIG) 3] + set ::FindInFiles::mask_$obj_idx [lindex $::CONFIG(FIND_IN_FILES_CONFIG) 4] + set ::FindInFiles::pattern_$obj_idx [lindex $::CONFIG(FIND_IN_FILES_CONFIG) 5] + }]} then { + set ::FindInFiles::recursive_$obj_idx 1 + set ::FindInFiles::regular_expr_$obj_idx 0 + set ::FindInFiles::case_sensitive_$obj_idx 1 + set ::FindInFiles::folder_$obj_idx {} + set ::FindInFiles::mask_$obj_idx {*.asm,*.c,*.h} + set ::FindInFiles::pattern_$obj_idx {} + } # Validate loaded configuration if {![string is boolean -strict [subst -nocommands "\$::FindInFiles::recursive_$obj_idx"]]} { diff --git a/lib/bottompanel/graph.tcl b/lib/bottompanel/graph.tcl index 3f21052..ea6061b 100644 --- a/lib/bottompanel/graph.tcl +++ b/lib/bottompanel/graph.tcl @@ -1,10 +1,13 @@ #!/usr/bin/tclsh -# Part of MCU 8051 IDE ( http://mcu8051ide.sf.net ) +# Part of MCU 8051 IDE ( http://http://www.moravia-microsystems.com/mcu8051ide ) ############################################################################ # Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012 by Martin Ošmera # # martin.osmera@gmail.com # # # +# Copyright (C) 2014 by Moravia Microsystems, s.r.o. # +# martin.osmera@moravia-microsystems.com # +# # # This program is free software; you can redistribute it and#or modify # # it under the terms of the GNU General Public License as published by # # the Free Software Foundation; either version 2 of the License, or # @@ -36,9 +39,9 @@ source "${::LIB_DIRNAME}/bottompanel/graph_wdg.tcl" ;# Graph widget class Graph { ## COMMON # Bool: The message: "Performance warning" was already displayed to the user - common performance_warning_already_shown 0 + public common performance_warning_already_shown 0 # Bool: show performance warning when enabling external HW simulation - common show_sim_per_warn ${::CONFIG(SHOW_PALE_WARN)} + public common show_sim_per_warn ${::CONFIG(SHOW_PALE_WARN)} # Variables related to object initialization private variable data_list ;# Teportary variable -- Configuration list diff --git a/lib/bottompanel/graph_wdg.tcl b/lib/bottompanel/graph_wdg.tcl index a528bc5..45dbd3c 100644 --- a/lib/bottompanel/graph_wdg.tcl +++ b/lib/bottompanel/graph_wdg.tcl @@ -1,10 +1,13 @@ #!/usr/bin/tclsh -# Part of MCU 8051 IDE ( http://mcu8051ide.sf.net ) +# Part of MCU 8051 IDE ( http://http://www.moravia-microsystems.com/mcu8051ide ) ############################################################################ # Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012 by Martin Ošmera # # martin.osmera@gmail.com # # # +# Copyright (C) 2014 by Moravia Microsystems, s.r.o. # +# martin.osmera@moravia-microsystems.com # +# # # This program is free software; you can redistribute it and#or modify # # it under the terms of the GNU General Public License as published by # # the Free Software Foundation; either version 2 of the License, or # @@ -33,30 +36,30 @@ set _GRAPH_WDG_TCL _ class GraphWidget { ## COMMON - common step_y 13 ;# Int: Vertical distance between graph rows - common half_edge 5 ;# Int: Half length of bit edge - common full_edge 10 ;# Int: Full length of bit edge + public common step_y 13 ;# Int: Vertical distance between graph rows + public common half_edge 5 ;# Int: Half length of bit edge + public common full_edge 10 ;# Int: Full length of bit edge # Big font (vertical header) - common big_font [font create \ + public common big_font [font create \ -family $::DEFAULT_FIXED_FONT \ -size -14 \ -weight bold \ ] # Small font (horizontal header) - common small_font [font create \ + public common small_font [font create \ -family $::DEFAULT_FIXED_FONT \ -size -14 \ -weight bold \ ] # Font for booleans values for each port - common bool_font [font create \ + public common bool_font [font create \ -family $::DEFAULT_FIXED_FONT \ -size -12 \ -weight bold \ ] # Definition of graph popup menu - common GRAPHMENU { + public common GRAPHMENU { {command {ON/OFF} {} 0 "graph_change_status_on" {} "Enable/Disable graph"} {separator} diff --git a/lib/bottompanel/messages.tcl b/lib/bottompanel/messages.tcl index e70c0a2..bb945ba 100644 --- a/lib/bottompanel/messages.tcl +++ b/lib/bottompanel/messages.tcl @@ -1,10 +1,13 @@ #!/usr/bin/tclsh -# Part of MCU 8051 IDE ( http://mcu8051ide.sf.net ) +# Part of MCU 8051 IDE ( http://http://www.moravia-microsystems.com/mcu8051ide ) ############################################################################ # Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012 by Martin Ošmera # # martin.osmera@gmail.com # # # +# Copyright (C) 2014 by Moravia Microsystems, s.r.o. # +# martin.osmera@moravia-microsystems.com # +# # # This program is free software; you can redistribute it and#or modify # # it under the terms of the GNU General Public License as published by # # the Free Software Foundation; either version 2 of the License, or # @@ -34,21 +37,21 @@ set _MESSAGES_TCL _ class Messages { ## COMMON - common set_shortcuts {} ;# Currently set shortcut bindigs for messages text - common shortcuts_cat {messages} ;# Key shortcut categories related to messages text + public common set_shortcuts {} ;# Currently set shortcut bindigs for messages text + public common shortcuts_cat {messages} ;# Key shortcut categories related to messages text # Normal font for messages text - common messages_normal_font [font create \ + public common messages_normal_font [font create \ -family $::DEFAULT_FIXED_FONT \ -size [expr {int(-12 * $::font_size_factor)}] \ ] # Bold font for messages text - common messages_bold_font [font create \ + public common messages_bold_font [font create \ -family $::DEFAULT_FIXED_FONT \ -size [expr {int(-12 * $::font_size_factor)}] \ -weight bold \ ] # Definition of popup menu for messages text - common MESSAGESMENU { + public common MESSAGESMENU { {command {Select all} {Ctrl+A} 0 "select_all_messages_text" {} "Select all text in this TextBox"} {command {Copy} {Ctrl+C} 0 "copy_messages_text" diff --git a/lib/bottompanel/terminal.tcl b/lib/bottompanel/terminal.tcl index 894fd3b..13dc40b 100644 --- a/lib/bottompanel/terminal.tcl +++ b/lib/bottompanel/terminal.tcl @@ -1,10 +1,13 @@ #!/usr/bin/tclsh -# Part of MCU 8051 IDE ( http://mcu8051ide.sf.net ) +# Part of MCU 8051 IDE ( http://http://www.moravia-microsystems.com/mcu8051ide ) ############################################################################ # Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012 by Martin Ošmera # # martin.osmera@gmail.com # # # +# Copyright (C) 2014 by Moravia Microsystems, s.r.o. # +# martin.osmera@moravia-microsystems.com # +# # # This program is free software; you can redistribute it and#or modify # # it under the terms of the GNU General Public License as published by # # the Free Software Foundation; either version 2 of the License, or # @@ -33,8 +36,8 @@ set _TERMINAL_TCL _ class Terminal { # Terminal emulator configuration - common configuration - common configuration_def [subst { + public common configuration + public common configuration_def [subst { bg #FFFFFF fg #000000 font_size 12 diff --git a/lib/bottompanel/todo.tcl b/lib/bottompanel/todo.tcl index 21f79a5..1258b33 100644 --- a/lib/bottompanel/todo.tcl +++ b/lib/bottompanel/todo.tcl @@ -1,10 +1,13 @@ #!/usr/bin/tclsh -# Part of MCU 8051 IDE ( http://mcu8051ide.sf.net ) +# Part of MCU 8051 IDE ( http://http://www.moravia-microsystems.com/mcu8051ide ) ############################################################################ # Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012 by Martin Ošmera # # martin.osmera@gmail.com # # # +# Copyright (C) 2014 by Moravia Microsystems, s.r.o. # +# martin.osmera@moravia-microsystems.com # +# # # This program is free software; you can redistribute it and#or modify # # it under the terms of the GNU General Public License as published by # # the Free Software Foundation; either version 2 of the License, or # @@ -32,44 +35,44 @@ set _TODO_TCL _ # -------------------------------------------------------------------------- class Todo { - common buttonActiveBg {#2222FF} ;# Color for button representing currently active text tags - common buttonSemiActBg {#8888FF} ;# - || - semi active tags + public common buttonActiveBg {#2222FF} ;# Color for button representing currently active text tags + public common buttonSemiActBg {#8888FF} ;# - || - semi active tags # Normal font for messages text - common todo_normal_font [font create \ + public common todo_normal_font [font create \ -family ${Editor::fontFamily} \ -size -${Editor::fontSize} \ ] - common normal_font [font create \ + public common normal_font [font create \ -family {helvetica} \ -size [expr {int(-12 * $::font_size_factor)}] \ -weight {normal} \ ] - common bold_font [font create \ + public common bold_font [font create \ -family {helvetica} \ -size [expr {int(-12 * $::font_size_factor)}] \ -weight {bold} \ ] # List of used text tags - common textTags { + public common textTags { tag_bold tag_italic tag_overstrike tag_underline } # List of XML tags for text tags (above) - common xmlTags { + public common xmlTags { b i s u } # List "tagging" buttons - common tagButtons { + public common tagButtons { button_bold button_italic button_strike button_under } # List of self closing tags - common selfCtags {bookmark} - common set_shortcuts {} ;# Currently set shortcut bindigs - common shortcuts_cat {todo} ;# Key shortcut categories related to this segment + public common selfCtags {bookmark} + public common set_shortcuts {} ;# Currently set shortcut bindigs + public common shortcuts_cat {todo} ;# Key shortcut categories related to this segment # ID of bookmark image - common bookmarkImage ok + public common bookmarkImage ok # Definition of the popup menu - common TODOMENU { + public common TODOMENU { {command {Undo} {Ctrl+Z} 0 "undo" {undo} "Undo last operation"} {command {Redo} {Ctrl+Shift+Z} 2 "redo" {redo} |