Reduced height of TX menu

diff --git a/tx_menu.c b/tx_menu.c
index f7a7224f2effc0fc5e2fd223d2df9e8e9e088b79..f5242df7c9f67c1a5d902889371879c00c1240aa 100644 (file)
--- a/tx_menu.c
+++ b/tx_menu.c
@@ -440,6 +440,14 @@ void tx_menu(GtkWidget *parent) {
   gtk_widget_show(panadapter_step_label);
   gtk_grid_attach(GTK_GRID(grid),panadapter_step_label,col,row,1,1);
 
+  col++;
+
+  GtkWidget *am_carrier_level_label=gtk_label_new(NULL);
+  gtk_label_set_markup(GTK_LABEL(am_carrier_level_label), "<b>AM Carrier Level:</b>");
+  gtk_widget_set_halign(am_carrier_level_label, GTK_ALIGN_START);
+  gtk_widget_show(am_carrier_level_label);
+  gtk_grid_attach(GTK_GRID(grid),am_carrier_level_label,col,row,1,1);
+
   row++;
   col=0;
 
@@ -465,15 +473,6 @@ void tx_menu(GtkWidget *parent) {
   gtk_grid_attach(GTK_GRID(grid),panadapter_step_r,col,row,1,1);
   g_signal_connect(panadapter_step_r,"value_changed",G_CALLBACK(panadapter_step_value_changed_cb),NULL);
 
-  row++;
-  col=0;
-
-  GtkWidget *am_carrier_level_label=gtk_label_new(NULL);
-  gtk_label_set_markup(GTK_LABEL(am_carrier_level_label), "<b>AM Carrier Level:</b>");
-  gtk_widget_set_halign(am_carrier_level_label, GTK_ALIGN_START);
-  gtk_widget_show(am_carrier_level_label);
-  gtk_grid_attach(GTK_GRID(grid),am_carrier_level_label,col,row,1,1);
-
   col++;
 
   GtkWidget *am_carrier_level=gtk_spin_button_new_with_range(0.0,1.0,0.1);
@@ -485,50 +484,12 @@ void tx_menu(GtkWidget *parent) {
   row++;
   col=0;
 
-  GtkWidget *emp_b=gtk_check_button_new_with_label("FM TX Pre-emphasize before limiting");
-  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (emp_b), !pre_emphasize);
-  gtk_widget_show(emp_b);
-  gtk_grid_attach(GTK_GRID(grid),emp_b,col,row,2,1);
-  g_signal_connect(emp_b,"toggled",G_CALLBACK(emp_cb),NULL);
-
-  row++;
-  col=0;
-
-  GtkWidget *ctcss_b=gtk_check_button_new_with_label("CTCSS Enable");
-  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (ctcss_b), transmitter->ctcss_enabled);
-  gtk_widget_show(ctcss_b);
-  gtk_grid_attach(GTK_GRID(grid),ctcss_b,col,row,1,1);
-  g_signal_connect(ctcss_b,"toggled",G_CALLBACK(ctcss_cb),NULL);
-
-
-  col++;
-  GtkWidget *ctcss_frequency_b=gtk_combo_box_text_new();
-  for(i=0;i<CTCSS_FREQUENCIES;i++) {
-    sprintf(temp,"%0.1f",ctcss_frequencies[i]);
-    gtk_combo_box_text_append(GTK_COMBO_BOX_TEXT(ctcss_frequency_b),NULL,temp);
-  }
-  gtk_combo_box_set_active(GTK_COMBO_BOX(ctcss_frequency_b),transmitter->ctcss);
-  my_combo_attach(GTK_GRID(grid),ctcss_frequency_b,col,row,1,1);
-  g_signal_connect(ctcss_frequency_b,"changed",G_CALLBACK(ctcss_frequency_cb),NULL);
-
-/*
-  col++;
-  GtkWidget *ctcss_spin=gtk_spin_button_new_with_range(67.0,250.3,0.1);
-  gtk_spin_button_set_value(GTK_SPIN_BUTTON(ctcss_spin),(double)transmitter->ctcss_frequency);
-  gtk_grid_attach(GTK_GRID(grid),ctcss_spin,col,row,1,1);
-  g_signal_connect(ctcss_spin,"value-changed",G_CALLBACK(ctcss_spin_cb),NULL);
-*/  
-  row++;
-  col=0;
-
   GtkWidget *tune_use_drive_b=gtk_check_button_new_with_label("Tune use drive");
   gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (tune_use_drive_b), transmitter->tune_use_drive);
   gtk_widget_show(tune_use_drive_b);
   gtk_grid_attach(GTK_GRID(grid),tune_use_drive_b,col,row,1,1);
   g_signal_connect(tune_use_drive_b,"toggled",G_CALLBACK(tune_use_drive_cb),NULL);
 
-  //row++;
-  //col=0;
   col++;
   
   GtkWidget *tune_percent_label=gtk_label_new(NULL);
@@ -566,6 +527,35 @@ void tx_menu(GtkWidget *parent) {
   gtk_grid_attach(GTK_GRID(grid),swr_alarm,col,row,1,1);
   g_signal_connect(swr_alarm,"value-changed",G_CALLBACK(swr_alarm_cb),NULL);
 
+  row++;
+  col=0;
+
+  GtkWidget *emp_b=gtk_check_button_new_with_label("FM TX Pre-emphasize before limiting");
+  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (emp_b), !pre_emphasize);
+  gtk_widget_show(emp_b);
+  gtk_grid_attach(GTK_GRID(grid),emp_b,col,row,2,1);
+  g_signal_connect(emp_b,"toggled",G_CALLBACK(emp_cb),NULL);
+
+  col++;
+  col++;
+
+  GtkWidget *ctcss_b=gtk_check_button_new_with_label("CTCSS Enable");
+  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (ctcss_b), transmitter->ctcss_enabled);
+  gtk_widget_show(ctcss_b);
+  gtk_grid_attach(GTK_GRID(grid),ctcss_b,col,row,1,1);
+  g_signal_connect(ctcss_b,"toggled",G_CALLBACK(ctcss_cb),NULL);
+
+
+  col++;
+  GtkWidget *ctcss_frequency_b=gtk_combo_box_text_new();
+  for(i=0;i<CTCSS_FREQUENCIES;i++) {
+    sprintf(temp,"%0.1f",ctcss_frequencies[i]);
+    gtk_combo_box_text_append(GTK_COMBO_BOX_TEXT(ctcss_frequency_b),NULL,temp);
+  }
+  gtk_combo_box_set_active(GTK_COMBO_BOX(ctcss_frequency_b),transmitter->ctcss);
+  my_combo_attach(GTK_GRID(grid),ctcss_frequency_b,col,row,1,1);
+  g_signal_connect(ctcss_frequency_b,"changed",G_CALLBACK(ctcss_frequency_cb),NULL);
+
   gtk_container_add(GTK_CONTAINER(content),grid);
 
   sub_menu=dialog;